dashstrap 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 673d4c2977f43c1b868a6e4d0f4083b2317a0ced
-  data.tar.gz: d74998f44274e37010bef670f4068a1a6275ad09
+  metadata.gz: 67a75d970b42e6bcde4d783185a504215252a98f
+  data.tar.gz: 8021b257f4b733337df26e29e804071dfe2eeee6
 SHA512:
-  metadata.gz: be29bc7ad27e5abb78860583dd4aac519018b122c845cf5d6f4e234516998779373e22cc4109895a1dfe1f06a43149fef0b0de126d7d6b504c833a23733a338c
-  data.tar.gz: b6c42121a9dc2f458dd5367b411b90a75911fa49aa463b0dbed149c34566dfdf720cf052e50adbea4edfcd34a1a7695cc60877375a9c16a29369af479f112249
+  metadata.gz: 36c25625f0d58f286d136bed705a92ddba840da38999f3fde69968595ff1bcfbc11d71f068fa35122ec6560937a52ad26708ef2d314af4b784593d232d7915f5
+  data.tar.gz: dd2bebd265233a7f50aef6c9e0ab5ee8aec72b4af88524e828beae028e0bff816759e763e8b8869723fbcfa9d1eaac4c5eb9e6467d7b2db784f5c97e1e3e7ede

data/app/assets/javascripts/dashstrap/application.js

@@ -1,2 +1,5 @@
-//= require dashstrap/functions
 //= require_tree ./modules
+//= require dashstrap/functions
+//= require moment
+//= require moment/fa
+//= require bootstrap-datetimepicker

data/app/assets/javascripts/dashstrap/modules/list-view.js

@@ -155,7 +155,6 @@ ListView.directive('listView', ["$filter", "gettext", "UserPermissions", functio
         };
 
         scope.delete_items = function(){
-
             var len = scope.selected_count();
             var objects_to_delete = [];
 

data/app/assets/stylesheets/dashstrap/ltr/application.css

@@ -15,3 +15,4 @@ bootstrap3-wysihtml5
 //= require dashstrap/ltr/ltr
 //= require select2/select2
 //= require select2/select2-bootstrap
+//= require bootstrap-datetimepicker

data/app/assets/stylesheets/dashstrap/main.css.scss

@@ -61,3 +61,4 @@ $tools_link_color: #3f3f3f;
    padding-right: 1em;
 
 }
+.datepicker{z-index:1151 !important;}

data/app/assets/stylesheets/dashstrap/rtl/application.css

@@ -16,3 +16,4 @@ bootstrap3-wysihtml5
 //= require dashstrap/rtl/rtl
 //= require select2/select2
 //= require select2/select2-bootstrap
+//= require bootstrap-datetimepicker

data/app/views/angular/403.html

@@ -0,0 +1,12 @@
+<div class="error-page">
+  <h2 class="headline text-red">403</h2>
+  <div class="error-content">
+    <h3><i class="fa fa-warning text-red"></i> Oops! You have do not have permission.</h3>
+    <p>
+      You do not have permission to access this page.
+      Meanwhile, you may <a href="/#">return to dashboard</a>.
+    </p>
+
+    </form>
+  </div>
+</div>

data/app/views/angular/404.html

@@ -0,0 +1,11 @@
+<div class="error-page">
+  <h2 class="headline text-yellow"> 404</h2>
+  <div class="error-content">
+    <h3><i class="fa fa-warning text-yellow"></i> Oops! Page not found.</h3>
+    <p translate>
+      We could not find the page you were looking for.
+      Meanwhile, you may <a href="/#">return to dashboard</a>.
+    </p>
+
+  </div><!-- /.error-content -->
+</div>

data/app/views/angular/auth/groups/new.html.slim

@@ -42,3 +42,15 @@
 
       .box-body
         .row
+          .col-xs-12
+            table.table.table-striped
+              tbody
+                tr
+                  th
+                    = _('Entity Name')
+                  th
+                    = _('Permission')
+                tr ng-repeat="perm in resource.permissions.all()"
+                  th
+                    | {{ perm }}
+                  th

data/app/views/angular/fields/datepicker/datepicker.html

@@ -1,5 +1,10 @@
-<div ng-switch="datepickerMode" role="application" ng-keydown="keydown($event)">
-  <daypicker ng-switch-when="day" tabindex="0"></daypicker>
-  <monthpicker ng-switch-when="month" tabindex="0"></monthpicker>
-  <yearpicker ng-switch-when="year" tabindex="0"></yearpicker>
-</div>
+<div>
+  <!-- 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/angular/fields/datetime/date.html

@@ -0,0 +1,7 @@
+<div class="form-group">
+  <div class='input-group date' id="{{element_id}}">
+    <input type='text' class="form-control"  ng-model="model"/>
+    <span class="input-group-addon"><span class="fa fa-calendar"></span>
+    </span>
+  </div>
+</div>

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

@@ -1,10 +1,7 @@
-<div>
-  <!-- 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 class="form-group">
+  <div class='input-group date' id="{{element_id}}" >
+    <input type='text' class="form-control" ng-model="model" />
+    <span class="input-group-addon"><span class="fa fa-calendar"></span>
+    </span>
   </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/angular/fields/datetime/time.html

@@ -1,25 +1,7 @@
-<div class="timeSelectorDirective" >
-  <div class="section hours">
-    <div class="increase" ng-click="increaseHours()">
-      <i class="icon fa fa-caret-up"></i>
-    </div>
-    <div class="display">
-      <input type="text" ng-model="hours" ng-change="change('hour')">
-    </div>
-    <div class="decrease" ng-click="decreaseHours()">
-      <i class="icon fa fa-caret-down"></i>
-    </div>
-  </div>
-  <div class="section minutes">
-    <div class="increase" ng-click="increaseMinutes()">
-      <i class="icon fa fa-caret-up"></i>
-    </div>
-    <div class="display">
-      <input type="text" ng-model="minutes" ng-model-onblur ng-change="update('minute')">
-    </div>
-    <div class="decrease" ng-click="decreaseMinutes()">
-      <i class="icon fa fa-caret-down">
-      </i>
-    </div>
+<div class="form-group">
+  <div class='input-group date' id="{{element_id}}" >
+    <input type='text' class="form-control" ng-model="model" />
+    <span class="input-group-addon"><span class="fa fa-clock-o"></span>
+    </span>
   </div>
 </div>

data/app/views/angular/fields/file/file.html.slim

@@ -0,0 +1 @@
+input multiple="" type="file"

data/app/views/angular/fields/file/file_upload.html

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

data/app/views/angular/list-view/index.html

@@ -5,8 +5,6 @@
 
 
 
-
-
 <div class="row">
   <div class="col-xs-12">
     <div class="box">

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

@@ -1,19 +1,19 @@
 <%- 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 -%>

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

@@ -19,6 +19,7 @@
       <%= yield %>
 
       <%= javascript_include_tag Faalis::Engine.dashboard_js_manifest %>
+
       <%= javascript_include_tag "locales/#{::I18n.locale}" %>
 
     </body>

data/dashstrap.gemspec

@@ -36,4 +36,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'select2-rails'
 
 
+  spec.add_dependency 'momentjs-rails', '>= 2.8.1'
+  spec.add_dependency 'bootstrap3-datetimepicker-rails', '~> 4.7'
 end

data/lib/dashstrap/engine.rb

@@ -2,6 +2,9 @@ require 'faalis/extension'
 require 'jquery-ui-rails'
 require 'font-awesome-rails'
 require 'select2-rails'
+require 'momentjs-rails'
+require 'bootstrap3-datetimepicker-rails'
+
 
 module Dashstrap
   class TemplateEngine < ::Rails::Engine

data/lib/dashstrap/version.rb

@@ -1,3 +1,3 @@
 module Dashstrap
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/dashstrap.rb

@@ -2,3 +2,4 @@ module Dashstrap
 end
 
 require 'dashstrap/engine'
+require 'dashstrap/version'

data/lib/generators/dashstrap/install_generator.rb

@@ -9,6 +9,16 @@ module Dashstrap
       def copy_scss_manifest
         directory 'stylesheets', 'app/assets/stylesheets'
       end
+
+      def assets_patch
+        append_file 'config/initializers/assets.rb' do
+          %Q(Rails.application.config.assets.precompile += ['fontawesome-webfont.eot',
+                                                   'fontawesome-webfont.woff',
+                                                   'fontawesome-webfont.ttf',
+                                                   'fontawesome-webfont.svg'])
+
+        end
+      end
     end
   end
 end

data/lib/generators/templates/js/list_view/details.html.erb

@@ -1,25 +1,39 @@
 <div class="row">
-  <div class="col-sm-12 col-md-8">
+  <div class="col-sm-12 col-md-9">
 
     <div class="details">
-    <% fields.each do |f, field_type| %>
-      <dl>
-      <% case field_type
-    when "belongs_to" %> <dt translate><%= f.capitalize %> :</dt> <dd clas="detail field value">{{object.<%= f %>.name}}</dd>
-      <% when "has_many" %><dl>
-        <dt translate><%= f.capitalize %> :</dt>
-        <ul>
-          <li ng-repeat="item in object.<%= f %>"> {{ item.name }}</li>
-        </ul>
-      </dl>
-    <% else %><dt translate><%= f.capitalize %> :</dt> <dd clas="detail field value">{{object.<%= f %>}}</dd>
-      <% end %></dl>
-    <% end %>
+      <% fields.each do |f, field_type| %>
+        <dl>
+          <% case field_type
+        when "belongs_to" %> <dt translate><%= f.capitalize %> :</dt> <dd clas="detail field value">{{object.<%= f %>.name}}</dd>
+          <% when "has_many" %><dl>
+            <dt translate><%= f.capitalize %> :</dt>
+            <ul>
+              <li ng-repeat="item in object.<%= f %>"> {{ item.name }}</li>
+            </ul>
+          </dl>
+          <% else %><dt translate><%= f.capitalize %> :</dt> <dd clas="detail field value">{{object.<%= f %>}}</dd>
+          <% end %></dl>
+      <% end %>
     </div>
 
-
   </div>
 
-  <div class="col-sm-12 col-md-4">
+  <div class="col-sm-12 col-md-3">
+    <% if resource_data["childs"]  %>
+      <div class="box box-solid">
+        <div class="box-body text-center">
+          <div class="btn-group-vertical">
+            <% resource_data["childs"].each do |item| %>
+              <a class="btn btn-info" ng-href="#/<%= resource_url %>/{{ object.id }}/<%= item.pluralize %>" translate>
+                <%= item.titleize %>
+              </a>
+            <% end %>
+          </div>
+        </div>
+      </div>
+    <% end %>
+
   </div>
 </div>
+</div>

data/lib/generators/templates/js/list_view/index.html.erb

@@ -1,6 +1,7 @@
 <% unless no_filter? %>
   <filter config="filter_config" result="<%= resource.pluralize.underscore %>"></filter>
 <% end %>
+
 <% unless no_bulk? %>
   <div class="row">
     <div class="col-sm-12">

data/lib/generators/templates/js/list_view/partials/add_controller.js.erb

@@ -78,7 +78,7 @@
                         $(".form input").val("");
                     }
                     else {
-                        $state.go("<%= resource.pluralize.underscore %>");
+                        $state.go("<%= resource.pluralize.underscore %>", {}, { reload: true });
                     }
                 }, function(data){
                     catch_error(data);
@@ -92,7 +92,7 @@
                     $(".form input").val("");
                 }
                 else {
-                    $state.go("<%= resource.pluralize.underscore %>");
+                    $state.go("<%= resource.pluralize.underscore %>", {}, { reload: true });
                 }
             }, function(data){
                 catch_error(data);

data/lib/generators/templates/js/list_view/partials/index_controller.js.erb

@@ -3,6 +3,7 @@
 <%= resource.pluralize %>.controller("<%= resource %>Controller", ["$rootScope", "$scope", "gettext", "Restangular", "catch_error", "$state", "$stateParams", function($rootScope, $scope, _, API, catch_error, $state, $stateParams){
 
     $rootScope.section_name = _("<%= resource.underscore.pluralize.titleize %>");
+
     $rootScope.section_slug = _("List");
 
     <% parents.each do |parent| %>
@@ -25,6 +26,7 @@
         list: <% if parent? %>API.<% parents.each do |parent| %>one("<%= parent %>", $scope.<%= parent %>_id)<% end %>.all("<%= resource.pluralize.underscore %>")<% else %>API.all("<%= resource.pluralize.underscore %>")<% end %>
     };
     $scope.<%= resource.pluralize.underscore %> = [];<% end %>
+
     <% unless no_bulk? %>// Cache object for each field name possible values
     $scope.cache = {};
 
@@ -85,6 +87,7 @@
             },
 
         },<% end %>
+            <% unless no_duplicate? %>
         {
             title: _("Duplicate"),
             icon: "fa fa-files-o",
@@ -106,6 +109,7 @@
                 }
             }
         }
+        <% end %>
 
     ];<% unless no_bulk? %>
 
@@ -178,7 +182,7 @@
         API.<% parents.each do |p| %>all("<%=p %>").<% end %>all("<%= resource.pluralize.underscore %>").customDELETE(query.join(","))
             .then(function(data) {
 
-                $scope.<%= resource.pluralize.underscore %> = _.filter($scope.<%= resource.pluralize.underscore %>, function(x){
+                $scope.<%= resource.pluralize.underscore %> = $scope.<%= resource.pluralize.underscore %>.filter(function(x){
                     return !(query.indexOf(x.id) != -1);
                 });
                 success_message(data.msg);

data/lib/tasks/grunt/Gruntfile.js

@@ -3,8 +3,8 @@ module.exports = function (grunt) {
         nggettext_extract: {
             pot: {
                 files: {
-                    'app/assets/locales/templates.pot': ['app/views/angularjs_templates/**/*.html',
-                                                        'app/views/angularjs_templates/**/*.html.erb',
+                    'app/assets/locales/templates.pot': ['app/views/angular/**/*.html',
+                                                        'app/views/angular/**/*.html.erb',
                                                         'app/assets/javascripts/**/*.js',
                                                         'app/assets/javascripts/**/*.js',
                                                         'app/assets/javascripts/**/*.coffee',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dashstrap
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Sameer Rahmani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -192,6 +192,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: momentjs-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.8.1
+- !ruby/object:Gem::Dependency
+  name: bootstrap3-datetimepicker-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.7'
 description: 'An awesome dashboard template for Faalis platform. '
 email:
 - lxsameer@gnu.org
@@ -222,7 +250,6 @@ files:
 - app/assets/stylesheets/dashstrap/ltr/application.css
 - app/assets/stylesheets/dashstrap/ltr/ltr.scss
 - app/assets/stylesheets/dashstrap/main.css.scss
-- app/assets/stylesheets/dashstrap/rtl/#application.css#
 - app/assets/stylesheets/dashstrap/rtl/application.css
 - app/assets/stylesheets/dashstrap/rtl/rtl.scss
 - app/assets/stylesheets/dashstrap/share.scss
@@ -232,6 +259,8 @@ files:
 - app/assets/stylesheets/simple/rtl/application.css
 - app/assets/stylesheets/simple/rtl/rtl.scss
 - app/assets/stylesheets/simple/share.scss
+- app/views/angular/403.html
+- app/views/angular/404.html
 - app/views/angular/auth/groups/details.html
 - app/views/angular/auth/groups/index.html.slim
 - app/views/angular/auth/groups/new.html.slim
@@ -252,8 +281,11 @@ files:
 - app/views/angular/fields/datepicker/month.html
 - app/views/angular/fields/datepicker/popup.html
 - app/views/angular/fields/datepicker/year.html
+- app/views/angular/fields/datetime/date.html
 - app/views/angular/fields/datetime/datetime.html
 - app/views/angular/fields/datetime/time.html
+- app/views/angular/fields/file/file.html.slim
+- app/views/angular/fields/file/file_upload.html
 - app/views/angular/fields/float/float.html
 - app/views/angular/fields/image/image.html
 - app/views/angular/fields/integer/integer.html

data/app/assets/stylesheets/dashstrap/rtl/#application.css#

@@ -1,4 +0,0 @@
-//= require dashstrap/main
-//= require dashstrap/rtl/rtl
-
-