faalis 1.0.0.alpha0 → 1.0.0.alpha1

data/app/assets/locale/templates.pot

@@ -29,14 +29,6 @@ msgstr ""
 msgid "Name :"
 msgstr ""
 
-#: app/views/angularjs_templates/auth/groups/new.html
-msgid "Workflows"
-msgstr ""
-
-#: app/views/angularjs_templates/auth/groups/new.html
-msgid "Choose any workflow which you want to allow user to have access to."
-msgstr ""
-
 #: app/views/angularjs_templates/auth/groups/new.html
 msgid "Advance Permissions"
 msgstr ""

data/app/controllers/faalis/#api_controller.rb#

@@ -0,0 +1,51 @@
+# -----------------------------------------------------------------------------
+#    Faalis - Basic website skel engine
+#    Copyright (C) 2012-2013 Yellowen
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# -----------------------------------------------------------------------------
+require_dependency "faalis/api_controller"
+
+
+class Faalis::APIController < Faalis::ApplicationController
+  respond_to :json
+
+  before_filter :authenticate_user!
+
+  protect_from_forgery
+
+  after_filter :set_csrf_cookie_for_ng
+
+  def set_csrf_cookie_for_ng
+    cookies['XSRF-TOKEN'] = form_authenticity_token if protect_against_forgery?
+  end
+
+  rescue_from CanCan::AccessDenied do |exception|
+
+    render :status => 403, :json => {
+      :error => _("You don't have access to this page"),
+      :orig_msg => exception.message,
+      :action => exception.action,
+    }
+  end
+
+  protected
+
+  def verified_request?
+    super || form_authenticity_token == request.headers['X-XSRF-TOKEN']
+  end
+
+  :
+end

data/app/controllers/faalis/#dashboard_controller.rb#

@@ -0,0 +1,65 @@
+require_dependency "faalis/application_controller"
+
+
+module Faalis
+  class DashboardController < ApplicationController
+
+    include Faalis::Dashboard::Controller
+
+    layout "faalis/dashboard"
+    before_filter :authenticate_user!, :only => [:modules, :index]
+
+    respond_to :json, :html
+
+    def jstemplate
+      if user_signed_in?
+        render :template => "angularjs_templates/#{params[:path]}", :layout => nil
+      else
+        render :login_required_page
+      end
+    end
+
+    def index
+      if params.include? :signin
+        redirect_to dashboard_path
+      end
+      @jstemplates_path = "/templates"
+    end
+
+    def modules
+      dashboard_modules = []
+      
+      Faalis::Engine.dashboard_modules.each do |module_name, attrs|
+        if not attrs.include? :title
+          attrs[:title] = _(module_name.to_s)
+        end
+
+        if not attrs.include? :resource
+          attrs[:resource] = module_name.to_s
+        end
+
+        # If class did not given by user in settings
+        # Faalis tries to guess the class name
+        if not attrs.include? :model
+          begin
+            klass = attrs[:resource].camelize.constantize
+
+            if klass.respond_to? :possible_permissions
+              attrs[:model] = attrs[:resource].camelize
+            else
+              attrs[:model] = ""
+            end
+
+          rescue NameError
+            attrs[:model] = ""
+          end
+        end
+
+        dashboard_modules << attrs
+      end
+      dashboard_modules = {:modules => dashboard_modules}
+      respond_with dashboard_modules
+    end
+  end
+
+end

data/app/controllers/faalis/application_controller.rb

@@ -20,15 +20,14 @@ class Faalis::ApplicationController < ActionController::Base
   include FastGettext::Translation
   before_filter :set_locale
 
-  def set_locale
-    FastGettext.add_text_domain 'faalis', :path => "#{Faalis::Engine.root}/config/locales", :type => :po
-    # All languages you want to allow
-    FastGettext.default_available_locales = Faalis::Engine.locales
-    FastGettext.default_text_domain = 'faalis'
-
-    lang = request.env['lang'] || params[:locale] || session[:locale] || I18n.default_locale
-    FastGettext.set_locale(lang.to_sym)
-    session[:locale] = I18n.locale = lang
-  end
+ def set_locale
+      FastGettext.add_text_domain 'faalis', :path => "#{Faalis::Engine.root}/config/locales", :type => :po
+      # All languages you want to allow
+      FastGettext.default_available_locales = Faalis::Engine.locales
+      FastGettext.default_text_domain = 'faalis'
 
+      lang = request.env['lang'] || params[:locale] || session[:locale] || I18n.default_locale
+      FastGettext.set_locale(lang.to_s)
+      session[:locale] = I18n.locale = :"#{lang}"
+ end
 end

data/app/controllers/faalis/dashboard_controller.rb

@@ -6,7 +6,7 @@ module Faalis
 
     include Faalis::Dashboard::Controller
 
-    layout "faalis/dashboard"
+    layout 'faalis/dashboard'
     before_filter :authenticate_user!, :only => [:modules, :index]
 
     respond_to :json, :html
@@ -23,7 +23,7 @@ module Faalis
       if params.include? :signin
         redirect_to dashboard_path
       end
-      @jstemplates_path = "/templates"
+      @jstemplates_path = '/templates'
     end
 
     def modules

data/app/models/faalis/user.rb

@@ -21,14 +21,6 @@ module Faalis
   # **User** model for **Faalis** platform
   class User < Faalis::ORM.proper_base_class
 
-    # AuthDefinitions contains all the **Devise** related configurations.
-    include Faalis::User::AuthDefinitions
-    # Permission related methods for user
-    include Faalis::User::Permission
-
-    # Make this model authorizable
-    include Faalis::Concerns::Authorizable
-
     # Define **User** fields if current ORM was Mongoid -----------------------
     if Faalis::ORM.mongoid?
       include Mongoid::Document
@@ -37,6 +29,14 @@ module Faalis
       # FIXME: Port mailboxer to work with mongoid
     end
 
+    # AuthDefinitions contains all the **Devise** related configurations.
+    include Faalis::User::AuthDefinitions
+    # Permission related methods for user
+    include Faalis::User::Permission
+
+    # Make this model authorizable
+    include Faalis::Concerns::Authorizable
+
     # Define **User** fields if current ORM was ActiveRecord-------------------
     if Faalis::ORM.active_record?
       # acts as messageable for mailboxer
@@ -46,9 +46,9 @@ module Faalis
     has_and_belongs_to_many :groups, class_name: 'Faalis::Group'
 
     # Validations
-    validates :password, presence: true, length: {minimum: 5, maximum: 120}, on: :create
-    validates :password, length: {minimum: 5, maximum: 120}, on: :update, allow_blank: true
-    validates :email, presence: true, length: {minimum: 6}
+    validates :password, presence: true, length: { minimum: 5, maximum: 120 }, on: :create
+    validates :password, length: { minimum: 5, maximum: 120 }, on: :update, allow_blank: true
+    validates :email, presence: true, length: { minimum: 6 }
 
     devise *@@devise_options
 

data/app/models/faalis/user/auth_definitions.rb

@@ -7,22 +7,10 @@ module Faalis
         # Include default devise modules. Others available are:
         # :token_authenticatable, :confirmable,
         # :lockable, :timeoutable and :omniauthable
-        @@devise_options = [:database_authenticatable,
-                            :registerable,
-                            :recoverable,
-                            :rememberable,
-                            :trackable,
-                            :lockable,
-                            :timeoutable,
-                            :validatable]
-
-        if Rails.env.production?
-          @@devise_options << :confirmable
-        end
+        @@devise_options = ::Faalis::Engine.devise_options
 
         if Devise.omniauth_configs.any?
-          @@devise_options << :omniauthable
-          @@devise_options << {:omniauth_providers => Devise.omniauth_configs.keys}
+          devise :omniauthable, :omniauth_providers => Devise.omniauth_configs.keys
         end
       end
       base.extend ClassMethods

data/app/models/faalis/user/mongoid_fields.rb

@@ -70,7 +70,6 @@ module Faalis
         index({ confirmation_token: 1 },
               { unique: true, background: true })
       end
-
     end
   end
 end

data/app/views/angularjs_templates/fields/datetime/datetime.html

@@ -1,4 +1,10 @@
 <div>
-  <datepicker disable-timepicker="timepicker" id="{{ element_id }}" ng-model="model" class="{{cssClasses}}" ng-required="required" name="{{ field }}" placeholder="{{ 'Click to pick a date' | translate }}" />
+  <!-- TODO: Find out why disable-timepicker and timepicker does not work together -->
+  <div ng-if="timepicker">
+    <quick-datepicker disable-timepicker="true" id="{{ element_id }}" ng-model="model" class="{{cssClasses}}" ng-required="required" name="{{ field }}" placeholder="{{ 'Click to pick a date' | translate }}" />
+  </div>
+  <div ng-if="!timepicker">
+    <quick-datepicker  id="{{ element_id }}" ng-model="model" class="{{cssClasses}}" ng-required="required" name="{{ field }}" placeholder="{{ 'Click to pick a date' | translate }}" />
+  </div>
   <small id="{{ msg_element_id }}"></small>
 </div>

data/app/views/angularjs_templates/fields/image/image.html

@@ -1 +1 @@
-<input type="file" />
+<input multiple=""  type="file" />

data/app/views/angularjs_templates/index.html

@@ -1,8 +1,3 @@
 <div class="row">
-    <div class="small-2 columns widget whitewidget text-center">
-      <h3>34 <i class="fa fa-user"></i></h3>
-    </div>
-    <div class="small-2 columns widget greenwidget">
-      sdfsdf
-    </div>
+
 </div>

data/app/views/angularjs_templates/modules.html

@@ -13,5 +13,5 @@
 
 <div class="brand">
   <h1 translate><%= Faalis::Engine.site_title %></h1>
-  <span translate>Some_Slug</span>
+  <span translate></span>
 </div>

data/app/views/devise/registrations/new.html.erb

@@ -1,3 +1,7 @@
+<%= content_tag(:div, flash[:error], :id => "flash_error") if flash[:error] %>
+<%= content_tag(:div, flash[:notice], :id => "flash_notice") if flash[:notice] %>
+<%= content_tag(:div, flash[:alert], :id => "flash_alert") if flash[:alert] %>
+
 <div class="wrapper_signup">
   <div class="row">
     <div class="layout_signup">
@@ -56,7 +60,7 @@
 		    <% end -%>
 		  </div>
 
-		  <% if resource.password_required? %>
+		  <% if resource.send('password_required?'.to_sym) %>
 		    <div class="field">
 		      <label><%=_("Password") %></label>
 		      <%= f.password_field :password, :class => "password input" %>

data/app/views/devise/sessions/new.html.erb

@@ -1,6 +1,11 @@
+<%= content_tag(:div, flash[:error], :id => "flash_error") if flash[:error] %>
+<%= content_tag(:div, flash[:notice], :id => "flash_notice") if flash[:notice] %>
+<%= content_tag(:div, flash[:alert], :id => "flash_alert") if flash[:alert] %>
+
+
 <div class="row single-form">
 
-  <div class="small-6 columns">
+  <div class="large-offset-3 small-6 columns">
     <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
       <fieldset>
         <legend><%= _("Sign In") %></legend>
@@ -28,21 +33,9 @@
         <div class="right submit">
 	  <%= f.submit _("Sign in"), :class => "button"%><br><br>
         </div>
-        <%= render "devise/shared/links" %>
-
-      </fieldset>
-
-    <% end %>
-  </div>
-
 
-  <div class="small-6 columns">
-    <div class="row">
-      <fieldset>
-
-        <legend><%= _("Login using") %>:</legend>
-
-        <div class="text-left">
+        <br>
+        <div class="text-left left">
           <a href="/auth/google_oauth2/" class="pull_right">
             <i class="fa-google-plus-square fa fa-3x"></i>
           </a>
@@ -55,8 +48,16 @@
             <i class="fa-twitter-square fa fa-3x"></i>
           </a>
         </div>
+        <br>
+        <br>
+        <div class="text-center">
+        <%= render "devise/shared/links" %>
+        </div>
       </fieldset>
 
-    </div>
+    <% end %>
+
   </div>
+
+
 </div>

data/app/views/devise/shared/_links.erb

@@ -1,25 +1,27 @@
+<p>
 <%- if controller_name != 'sessions' %>
-  <%= link_to "Sign in", new_session_path(resource_name) %><br />
+  <%= link_to "Sign in", new_session_path(resource_name) %>   <br>
 <% end -%>
 
 <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
-  <%= link_to "Sign up", new_registration_path(resource_name) %><br />
+  <%= link_to "Sign up", new_registration_path(resource_name) %>   <br>
 <% end -%>
 
 <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
-  <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
+  <%= link_to "Forgot your password?", new_password_path(resource_name) %>  <br>
 <% end -%>
 
 <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
-  <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
+  <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>  <br>
 <% end -%>
 
 <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
-  <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
+  <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %> <br>
 <% end -%>
 
 <%- if devise_mapping.omniauthable? %>
   <%- resource_class.omniauth_providers.each do |provider| %>
-    <%= link_to "Sign in with #{provider.to_s.titleize}", faalis.user_omniauth_authorize_path(provider) %><br />
+    <%= link_to "Sign in with #{provider.to_s.titleize}", faalis.user_omniauth_authorize_path(provider) %>
   <% end -%>
 <% end -%>
+</p>

data/app/views/layouts/faalis/application.html.erb

@@ -68,10 +68,6 @@
           </div>
           <div class="large-6 columns">
             <ul class="inline-list right">
-              <li><a href="#">Link 1</a></li>
-              <li><a href="#">Link 2</a></li>
-              <li><a href="#">Link 3</a></li>
-              <li><a href="#">Link 4</a></li>
             </ul>
           </div>
         </div>

data/app/views/layouts/faalis/dashboard.html.erb

@@ -10,12 +10,12 @@
 <body data-current-user="<%= current_user.to_json %>">
 
   <%= yield %>
-
   <%= javascript_include_tag Faalis::Engine.dashboard_js_manifest %>
   <div id="auth" style="display: none;">
     <p class="notice"><%= notice %></p>
     <p class="alert"><%= alert %></p>
   </div>
-  <%= javascript_include_tag "locale/#{::I18n.locale}" %>
+  <%= javascript_include_tag "locales/#{::I18n.locale}" %>
+
 </body>
 </html>

data/app/views/layouts/faalis/simple.html.erb

@@ -4,33 +4,31 @@
     <title><%= Faalis::Engine.site_title %></title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <%= stylesheet_link_tag  Faalis::I18n.direction(I18n.locale) + "/application", media: "all" %>
+    <%= stylesheet_link_tag  "dashboard/" + Faalis::I18n.direction(I18n.locale) + "/application", media: "all" %>
     <%= javascript_include_tag :modernizr %>
     <%= csrf_meta_tags %>
   </head>
   <body>
 
-        <%= yield %>
+    <%= yield %>
 
-        <!-- Footer -->
-
-        <hr/>
-        <footer class="plain">
-          <div class="row">
-            <div class="large-6 columns">
-              <p>&copy; Copyright no one at all. Go to town.</p>
-            </div>
-            <div class="large-6 columns">
-              <ul class="inline-list right">
-                <li><a href="#">Link 1</a></li>
-                <li><a href="#">Link 2</a></li>
-                <li><a href="#">Link 3</a></li>
-                <li><a href="#">Link 4</a></li>
-              </ul>
-            </div>
-          </div>
-        </footer>
+    <!-- Footer -->
+    <hr/>
+    <footer class="plain">
+      <div class="row">
+        <div class="large-6 columns">
+          <p>&copy; Copyright no one at all. Go to town.</p>
+        </div>
+        <div class="large-6 columns">
+          <ul class="inline-list right">
+            <li><a href="#">Link 1</a></li>
+            <li><a href="#">Link 2</a></li>
+            <li><a href="#">Link 3</a></li>
+            <li><a href="#">Link 4</a></li>
+          </ul>
+        </div>
       </div>
-    </div>
+    </footer>
 
     <%= javascript_include_tag "faalis/application" %>
     <%= javascript_include_tag "locale/#{::I18n.locale}" %>