faalis 0.7.0 → 0.11.0

data/lib/faalis/version.rb

@@ -18,5 +18,5 @@
 # -----------------------------------------------------------------------------
 
 module Faalis
-  VERSION = "0.7.0"
+  VERSION = "0.11.0"
 end

data/lib/generators/faalis/install_generator.rb

@@ -25,6 +25,10 @@ module Faalis
       desc "Copy all the necessary files to use Red Base"
       class_option :orm
 
+      def install_mailboxer
+        invoke "mailboxer:install"
+      end
+
       def copy_init_files
         template "devise.rb", "config/initializers/devise.rb"
         template "faalis.rb", "config/initializers/faalis.rb"

data/lib/generators/faalis/js_scaffold_generator.rb

@@ -29,28 +29,41 @@ module Faalis
       argument :resource_fields, type: :array, default: [], banner: "fields[:types]"
       class_option :without_specs, :type => :boolean, :default => false, :desc => "Do not install specs"
       class_option :only_specs, :type => :boolean, :default => false, :desc => "Generate only spec files"
+      class_option :only_controller, :type => :boolean, :default => false, :desc => "Generate only controller"
       class_option :bulk_fields, :type => :string, :default => "", :desc => "Fields to use in in bulk edit, comma separated"
       class_option :no_bulk, :type => :boolean, :default => false, :desc => "No bulk edit needed"
       class_option :menu, :type => :string, :default => "", :desc => "Provide menu items which should be in sidebar. format: menu1:url,menu2:url"
       class_option :title_field, :type => :string, :default => "name", :desc => "Field name to use as title of each object"
       class_option :required, :type => :string, :default => "", :desc => "Non optional fields, comma separated"
       class_option :deps, :type => :string, :default => "", :desc => "Dependencies of Angularjs module, comma separated"
+      class_option :path, :type => :string, :default => "", :desc => "Path to js_scaffold target inside 'app/assets/javascripts/'"
+      class_option :raw_path, :type => :string, :default => "", :desc => "Path to js_scaffold target"
       class_option :tabs, :type => :string, :default => "", :desc => "Add tabs to 'new' view of scaffold. format: --tabs tab1:'field1;field2',tab2 Note: __all__ field include all fileds."
       class_option :no_filter, :type => :boolean, :default => false, :desc => "Don't view a filter box"
+      class_option :no_new_template, :type => :boolean, :default => false, :desc => "Don't copy the new.html template"
+
 
       desc "Create a new resource for client side application"
       def create_module
-        unless options[:only_specs]
-          template "angularjs/module.js.erb", "#{angularjs_app_path}modules/#{resource_path}.js"
+        unless options[:only_controller]
+          unless options[:only_specs]
+            template "angularjs/module.js.erb", "#{angularjs_app_path}modules/#{resource_path}.js"
+          end
         end
       end
 
       def create_template
-        unless options[:only_specs]
-          template "angularjs/index.html.erb", "app/views/angularjs_templates/#{resource.underscore}/index.html"
-          template "angularjs/new.html.erb", "app/views/angularjs_templates/#{resource.underscore}/new.html"
-          template "angularjs/details.html.erb", "app/views/angularjs_templates/#{resource.underscore}/details.html"
+        unless options[:only_controller]
+          unless options[:only_specs]
+            template "angularjs/index.html.erb", "app/views/angularjs_templates/#{resource.underscore}/index.html"
+            unless options[:no_new_template]
+              template "angularjs/new.html.erb", "app/views/angularjs_templates/#{resource.underscore}/new.html"
+            end
+            template "angularjs/details.html.erb", "app/views/angularjs_templates/#{resource.underscore}/details.html"
+          end
+        end
 
+        unless options[:only_specs]
           template "views/index.json.jbuilder.erb", "app/views/api/v1/#{resource.pluralize.underscore}/index.json.jbuilder"
           template "views/show.json.jbuilder.erb", "app/views/api/v1/#{resource.pluralize.underscore}/show.json.jbuilder"
           template "views/create.json.jbuilder.erb", "app/views/api/v1/#{resource.pluralize.underscore}/create.json.jbuilder"
@@ -109,8 +122,14 @@ module Faalis
       end
 
       def angularjs_app_path
-        path = Faalis::Engine.dashboard_js_manifest.split("/")[0..-2].join("/")
-        "app/assets/javascripts/#{path}/"
+        if options[:raw_path] != ""
+          options[:raw_path]
+        elsif options[:path] != ""
+          "app/assets/javascripts/#{options[:path]}/"
+        else
+          path = Faalis::Engine.dashboard_js_manifest.split("/")[0..-2].join("/")
+          "app/assets/javascripts/#{path}/"
+        end
       end
 
       # Tabs ------------------------------------

data/lib/generators/faalis/templates/angularjs/module.js.erb

@@ -20,7 +20,7 @@
 
 <% end %>
 // <%= resource.pluralize %> Module
-var <%= resource.pluralize %> = angular.module("<%= resource %>", ["ListView", "Filter", "Anim"<% if options[:deps] %><% options[:deps].split(",").each do |dependency| %>, "<%= dependency.camelize %>"<% end %><% end %>]);
+var <%= resource.pluralize %> = angular.module("<%= resource %>", ["ListView", "Filter", "Anim", "Fields",<% if options[:deps] %><% options[:deps].split(",").each do |dependency| %>, "<%= dependency.camelize %>"<% end %><% end %>]);
 
 // <%= resource.pluralize %> configuration section ---------------------------
 <%= resource.pluralize %>.config(["$routeProvider", function($routeProvider){
@@ -222,11 +222,13 @@ var <%= resource.pluralize %> = angular.module("<%= resource %>", ["ListView", "
     $scope.obj_id = null;
     var is_copy = false;
 
-    <% fields.each do |name, type| %><% if ["belongs_to", "has_many"].include? type %><%= type.get_list %>.then(function(data){
-        $scope.all_<%= type.resource_name %> = data;
-    }, function(data){
-        catch_error(data);
-    });<% end %><% end %>
+    <% fields.each do |name, type| %><% if ["belongs_to", "in", "has_many"].include? type %>
+    $scope.<%= name %>_data = {
+        type: '<%= type %>',<% if type == "in" %>
+        choices: _.sortBy([<% type.to.split(",").each do |choice| %>{name: "<%= choice.underscore %>", title: "<%= choice.humanize %>"},<% end %>]),<% else %>
+        to: '<%= type.to %>',<% end %>
+        name: '<%= name %>'
+    };<% end %><% end %>
     <% fields.each do |name, type| %><% if type == "in" %>$scope.<%= name %>_choices = _.sortBy([<% type.to.split(",").each do |choice| %>
         {name: "<%= choice.underscore %>", title: "<%= choice.humanize %>"},<% end %>
     ], "title");<% end %><% end %>
@@ -248,7 +250,6 @@ var <%= resource.pluralize %> = angular.module("<%= resource %>", ["ListView", "
 
     }
 
-
     $scope.have = function(field, obj_id) {
         var tmp = _.where($scope[field], {id: obj_id});
         if (tmp.length > 0) {
@@ -265,6 +266,9 @@ var <%= resource.pluralize %> = angular.module("<%= resource %>", ["ListView", "
     };
 
     $scope.save = function(save_another){
+        $("small.error").html("");
+        $("small.error").removeClass("error");
+
         var <%= resource.underscore %> = {<%= resource.underscore %>: {<% fields.each do |field_name, field_type| %>
             <% if ["belongs_to"].include? field_type %><%= field_name %>_id: parseInt($scope.<%= field_name %>),<% else %><%= field_name %>: $scope.<%= field_name %>,<% end %><% end %>
             __res__: 0

data/lib/generators/faalis/templates/angularjs/new.html.erb

@@ -1,97 +1,54 @@
 <% if any_tabs? %><section class="tabs"><% tab_count = 1 %>
   <ul><% tabs.each do |name, fields| %>
-      <li ng-click="activate_tab(<%= tab_count %>)" ng-class="{active: current_tab == <%= tab_count %>, tab<%= tab_count %>: current_tab == <%= tab_count %>}"><span translate><%= name %></span></li> |<% tab_count += 1 %>
-    <% end %></ul>
+      <li ng-click="activate_tab(<%= tab_count %>)" ng-class="{active: current_tab == <%= tab_count %>, tab<%= tab_count %>: current_tab == <%= tab_count %>}"><span translate><%= name %></span></li> |<% tab_count += 1 %><% end %>
+  </ul>
 </section><% end %>
+
 <% unless any_tabs? %>
 <form novalidate name="form">
  <div class="newform">
   <fieldset class="form">
 
-  <legend ng-if="!editing"><span translate>New <%= resource.underscore.pluralize.humanize %></span></legend>
-  <legend ng-if="editing"><span translate>Edit <%= resource.underscore.pluralize.humanize %></span></legend>
+    <legend ng-if="!editing"><span translate>New <%= resource.underscore.pluralize.humanize %></span></legend>
+    <legend ng-if="editing"><span translate>Edit <%= resource.underscore.pluralize.humanize %></span></legend>
 
-  <% first = true %>
-  <% fields.each do |field_name, field_type| %>
+    <% first = true %><% fields.each do |field_name, field_type| %>
     <% if first %><div class="row"><% end %>
       <div class="small-4 columns <% if not first %>float-left small-offset-2<% end %>">
-        <label><% if required_fields.include? field_name %><i class="inline fa fa-asterisk"></i> <% end %><span translate><%= field_name.to_s.humanize.capitalize %></span> :</label>
-        <% case field_type
-           when "belongs_to" %>
-          <select ui-select2="select2options" id="id_<%= field_name %>" ng-model="<%= field_name %>" name="<%= field_name %>" <% if required_fields.include? field_name %>required<% end %>>
-            <option ng-repeat="item in all_<%= field_type.resource_name %>" value="{{ item.id }}" title="{{ item.name || item }}" ng-selected="item.id === <%= field_name %>.id">{{ item.name || item }}</option>
-          </select>
-          <% when "has_many" %>
-          <select ui-select2="select2options" ng-model="<%= field_name %>" id="id_<%= field_name %>" name="<%= field_name %>" multiple <% if required_fields.include? field_name %>required<% end %>>
-            <option ng-repeat="item in all_<%= field_type.resource_name %>" value="{{ item.id }}" title="{{ item.name || item }}" ng-selected="have('<%= field_name %>', item.id)">{{ item.name || item }}</option>
-          </select>
-          <% when "in" %>
-          <select id="id_<%= field_name %>" ui-select2="select2options" ng-model="<%= field_name %>" name="<%= field_name %>" <% if required_fields.include? field_name %>required<% end %>>
-            <option ng-repeat="item in <%= field_name %>_choices" value="{{ item.name }}" title="{{ item.title }}" ng-selected="<%= field_name %> === item.name">{{ item.title }}</option>
-          </select>
-          <% when "text" %>
-          <textarea id="id_<%= field_name %>" class="rounded" ng-model="<%= field_name %>" name="<%= field_name %>" <% if required_fields.include? field_name %>required<% end %>></textarea>
-          <% when "boolean" %>
-          <input  id="id_<%= field_name %>" ng-model="<%= field_name %>" type="checkbox" name="<%= field_name %>" class="rounded <%= field_type %>_field" <% if required_fields.include? field_name %>required<% end %> />
-          <% when "datetime" %>
-          <datepicker  id="id_<%= field_name %>" ng-model="<%= field_name %>" class="datetime_field" name="<%= field_name %>" placeholder="{{ 'Click to pick a date' | translate }}" <% if required_fields.include? field_name %>required<% end %> />
-          <% when "string", nil %>
-          <input  id="id_<%= field_name %>" ng-model="<%= field_name %>" name="<%= field_name %>" type="text" class="rounded <%= field_type %>_field" <% if required_fields.include? field_name %>required<% end %> />
+        <label><% if required_fields.include? field_name %><i class="inline fa fa-asterisk"></i> <% end %><span translate><%= field_name.to_s.humanize.capitalize %></span> :</label><% case field_type
+         when "belongs_to", "has_many", "in" %>
+        <relation-field select2-options="select2options" <% if required_fields.include? field_name %>required="true"<% end %> title-field="'name'" model="<%= field_name %>" field-data="<%= field_name %>_data">
+        </relation-field>
+        <% when nil %>
+        <string-field model="<%= field_name %>" field-name="'<%= field_name %>'" css-class="'rounded <%= field_type %>_field'" <% if required_fields.include? field_name %>required<% end %>></string-field>
         <% else %>
-          <input  id="id_<%= field_name %>" ng-model="<%= field_name %>" type="<%= field_type %>" name="<%= field_name %>" class="rounded <%= field_type %>_field" <% if required_fields.include? field_name %>required<% end %> />
-  <% end %>
-          <small id="id_<%= field_name %>_msg"></small>
-    </div>
-  <% if not first %></div><% end %>
-  <% first = !first %>
-  <% end %>
+        <<%= field_type%>-field model="<%= field_name %>" field-name="'<%= field_name %>'" css-class="'rounded <%= field_type %>_field'" <% if required_fields.include? field_name %>required="true"<% end %>></<%= field_type%>-field><% end %>
+      </div>
+    <% if not first %></div><% end %><% first = !first %><% end %>
   </fieldset>
 </form>
 
+<% else %><form novalidate name="form"><% tab_count = 1 %><% tabs.each do |name, field_names| %>
+  <div class="newform">
+    <fieldset class="form" ng-show="current_tab == <%= tab_count %>">
+      <legend ng-if="!editing"><span translate>New <%= name %></span></legend>
+      <legend ng-if="editing"><span translate>Edit <%= name %></span></legend><% first = true %>
+      <% fields.each do |field_name, field_type| %><% if tabs[name].include? field_name or tabs[name].include? "__all__" %>
 
-
-<% else %><% tab_count = 1 %><% tabs.each do |name, field_names| %>
-<form novalidate name="form">
- <div class="newform">
-  <fieldset class="form" ng-if="current_tab == <%= tab_count %>">
-  <legend ng-if="!editing"><span translate>New <%= name %></span></legend>
-  <legend ng-if="editing"><span translate>Edit <%= name %></span></legend><% first = true %>
-  <% fields.each do |field_name, field_type| %><% if tabs[name].include? field_name or tabs[name].include? "__all__" %>
-    <% if first %><div class="row"><% end %>
-      <div class="small-4 columns <% if not first %>float-left small-offset-2<% end %>">
-        <label><% if required_fields.include? field_name %><i class="inline fa fa-asterisk"></i> <% end %><span translate><%= field_name.to_s.humanize.capitalize %></span> :</label>
-        <% case field_type
-           when "belongs_to" %>
-          <select ui-select2="select2options" id="id_<%= field_name %>" ng-model="<%= field_name %>" name="<%= field_name %>" <% if required_fields.include? field_name %>required<% end %>>
-            <option ng-repeat="item in all_<%= field_type.resource_name %>" value="{{ item.id }}" title="{{ item.name || item }}" ng-selected="item.id === <%= field_name %>.id">{{ item.name || item }}</option>
-          </select>
-          <% when "has_many" %>
-          <select ui-select2="select2options" ng-model="<%= field_name %>" id="id_<%= field_name %>" name="<%= field_name %>" multiple <% if required_fields.include? field_name %>required<% end %>>
-            <option ng-repeat="item in all_<%= field_type.resource_name %>" value="{{ item.id }}" title="{{ item.name || item }}" ng-selected="have('<%= field_name %>', item.id)">{{ item.name || item }}</option>
-          </select>
-          <% when "in" %>
-          <select ui-select2="select2options" id="id_<%= field_name %>" ng-model="<%= field_name %>" name="<%= field_name %>" <% if required_fields.include? field_name %>required<% end %>>
-            <option ng-repeat="item in <%= field_name %>_choices" value="{{ item.name }}" title="{{ item.title }}" ng-selected="<%= field_name %> === item.name">{{ item.title }}</option>
-          </select>
-          <% when "text" %>
-          <textarea id="id_<%= field_name %>" ng-model="<%= field_name %>" class="rounded" name="<%= field_name %>" <% if required_fields.include? field_name %>required<% end %>></textarea>
-          <% when "boolean" %>
-          <input  id="id_<%= field_name %>" ng-model="<%= field_name %>" type="checkbox" name="<%= field_name %>" class="rounded <%= field_type %>_field" <% if required_fields.include? field_name %>required<% end %> />
-          <% when "datetime" %>
-          <datepicker  id="id_<%= field_name %>" ng-model="<%= field_name %>" class="datetime_field" name="<%= field_name %>" placeholder="{{ 'Click to pick a date' | translate }}" <% if required_fields.include? field_name %>required<% end %> />
-          <% when "string", nil %>
-          <input  id="id_<%= field_name %>" ng-model="<%= field_name %>" name="<%= field_name %>" type="text" class="rounded <%= field_type %>_field" <% if required_fields.include? field_name %>required<% end %> />
-        <% else %>
-          <input  id="id_<%= field_name %>" ng-model="<%= field_name %>" type="<%= field_type %>" name="<%= field_name %>" class="rounded <%= field_type %>_field" <% if required_fields.include? field_name %>required<% end %> />
-  <% end %>
-          <small id="id_<%= field_name %>_msg"></small>
-    </div>
-  <% if not first %></div><% end %>
-  <% first = !first %>
-  <% end %>
-  <% end %>
-  </fieldset><% tab_count += 1 %>
-<% end %>
+      <% if first %><div class="row"><% end %>
+        <div class="small-4 columns <% if not first %>float-left small-offset-2<% end %>">
+          <label><% if required_fields.include? field_name %><i class="inline fa fa-asterisk"></i> <% end %><span translate><%= field_name.to_s.humanize.capitalize %></span> :</label><% case field_type
+           when "belongs_to", "has_many", "in" %>
+          <relation-field select2-options="select2options" <% if required_fields.include? field_name %>required="true"<% end %> title-field="'name'" model="<%= field_name %>" field-data="<%= field_name %>_data">
+          </relation-field>
+          <% when nil %>
+          <string-field model="<%= field_name %>" field-name="'<%= field_name %>'" css-class="'rounded <%= field_type %>_field'" <% if required_fields.include? field_name %>required<% end %>></string-field>
+          <% else %>
+          <<%= field_type%>-field model="<%= field_name %>" field-name="'<%= field_name %>'" css-class="'rounded <%= field_type %>_field'" <% if required_fields.include? field_name %>required="true"<% end %>></<%= field_type%>-field><% end %>
+        </div>
+      <% if not first %></div><% end %><% first = !first %><% end %><% end %>
+    </fieldset>
+  </div><% tab_count += 1 %><% end %>
 </form>
 <% end %>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faalis
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Sameer Rahmani
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -67,6 +67,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mailboxer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
@@ -222,19 +236,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: formtastic
+  name: model_discovery
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -332,6 +346,7 @@ files:
 - app/models/faalis/group.rb
 - app/models/faalis/user.rb
 - app/models/faalis/permission.rb
+- app/models/faalis/permissions/auth.rb
 - app/views/devise/unlocks/new.html.erb
 - app/views/devise/sessions/new.html.erb
 - app/views/devise/confirmations/new.html.erb
@@ -346,7 +361,6 @@ files:
 - app/views/angularjs_templates/list-view/index.html
 - app/views/angularjs_templates/filter/index.html
 - app/views/angularjs_templates/modules.html
-- app/views/angularjs_templates/#index.html#
 - app/views/angularjs_templates/auth/users/new.html
 - app/views/angularjs_templates/auth/users/index.html
 - app/views/angularjs_templates/auth/users/details.html
@@ -355,17 +369,32 @@ files:
 - app/views/angularjs_templates/auth/groups/index.html
 - app/views/angularjs_templates/auth/groups/details.html
 - app/views/angularjs_templates/auth/profile/edit.html
+- app/views/angularjs_templates/conversations/new.html
+- app/views/angularjs_templates/conversations/show_details.html
+- app/views/angularjs_templates/conversations/index.html
+- app/views/angularjs_templates/conversations/show.html
+- app/views/angularjs_templates/conversations/details.html
 - app/views/angularjs_templates/index.html
 - app/views/angularjs_templates/locale/fa.po
 - app/views/angularjs_templates/locale/templates.pot
 - app/views/angularjs_templates/logs/index.html
+- app/views/angularjs_templates/fields/boolean/boolean.html
+- app/views/angularjs_templates/fields/string/string.html
+- app/views/angularjs_templates/fields/integer/integer.html
+- app/views/angularjs_templates/fields/text/text.html
+- app/views/angularjs_templates/fields/relation/relation.html
+- app/views/angularjs_templates/fields/datetime/datetime.html
 - app/views/angularjs_templates/nav.html.erb
 - app/views/layouts/faalis/application.html.erb
 - app/views/layouts/faalis/dashboard.html.erb
 - app/views/faalis/home/index.html.erb
 - app/views/faalis/dashboard/index.html.erb
 - app/views/faalis/dashboard/login_required_page.html.erb
+- app/views/faalis/api/v1/permissions/user_permissions.json.jbuilder
 - app/views/faalis/api/v1/permissions/index.json.jbuilder
+- app/views/faalis/api/v1/conversations/show.json.jbuilder
+- app/views/faalis/api/v1/conversations/create.json.jbuilder
+- app/views/faalis/api/v1/conversations/index.json.jbuilder
 - app/views/faalis/api/v1/users/show.json.jbuilder
 - app/views/faalis/api/v1/users/show.html.erb
 - app/views/faalis/api/v1/users/edit.html.erb
@@ -424,8 +453,17 @@ files:
 - app/assets/javascripts/faalis/dashboard/modules/auth/user.js
 - app/assets/javascripts/faalis/dashboard/modules/api.js
 - app/assets/javascripts/faalis/dashboard/modules/modules.js
+- app/assets/javascripts/faalis/dashboard/modules/conversations.js
 - app/assets/javascripts/faalis/dashboard/modules/filter.js
 - app/assets/javascripts/faalis/dashboard/modules/logs.js
+- app/assets/javascripts/faalis/dashboard/modules/permissions.js
+- app/assets/javascripts/faalis/dashboard/modules/fields/relation.js
+- app/assets/javascripts/faalis/dashboard/modules/fields/datetime.js
+- app/assets/javascripts/faalis/dashboard/modules/fields/string.js
+- app/assets/javascripts/faalis/dashboard/modules/fields/boolean.js
+- app/assets/javascripts/faalis/dashboard/modules/fields/fields.js
+- app/assets/javascripts/faalis/dashboard/modules/fields/integer.js
+- app/assets/javascripts/faalis/dashboard/modules/fields/text.js
 - app/assets/javascripts/faalis/dashboard/modules/errors.js
 - app/assets/javascripts/faalis/dashboard/functions.js.erb
 - app/assets/javascripts/faalis/dashboard/application.js.erb
@@ -491,6 +529,7 @@ files:
 - app/controllers/faalis/api/v1/users_controller.rb
 - app/controllers/faalis/api/v1/logs_controller.rb
 - app/controllers/faalis/api/v1/permissions_controller.rb
+- app/controllers/faalis/api/v1/conversations_controller.rb
 - app/controllers/faalis/api/v1/groups_controller.rb
 - app/controllers/faalis/api/v1/profiles_controller.rb
 - app/helpers/faalis/users_helper.rb
@@ -506,10 +545,10 @@ files:
 - config/locales/devise.en.yml
 - config/locales/faalis.pot
 - config/initializers/devise.rb
-- db/migrate/20131021170923_create_red_base_permissions.rb
+- db/migrate/20131020124701_create_faalis_groups.rb
+- db/migrate/20131021170923_create_faalis_permissions.rb
 - db/migrate/20131123120422_add_permissions_groups_table.rb
-- db/migrate/20131020124701_create_red_base_groups.rb
-- db/migrate/20131013091000_devise_create_red_base_users.rb
+- db/migrate/20131013091000_devise_create_faalis_users.rb
 - db/seeds.rb
 - lib/faalis_plugin.rb
 - lib/tasks/faalis_tasks.rake
@@ -550,6 +589,7 @@ files:
 - lib/generators/faalis/install_specs_generator.rb
 - lib/faalis/initialize.rb
 - lib/faalis/i18n.rb
+- lib/faalis/permissions.rb
 - lib/faalis/plugins.rb
 - lib/faalis/dashboard.rb
 - lib/faalis/active_record.rb

data/app/views/angularjs_templates/#index.html#

@@ -1,8 +0,0 @@
-<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>