dashstrap 0.2.2 → 0.2.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: cd16544d359078ffb94b91ff3f7e84b7abab42ab
4
- data.tar.gz: 2942cc2e0cfaf2f0ce40062f057158e783415ed6
3
+ metadata.gz: 9bd360a97a2a796fc4e2b61f66aa320b5d98e545
4
+ data.tar.gz: 967bcaaaf0b21cc979d12b268d30f89ac78c452f
5
5
  SHA512:
6
- metadata.gz: 8608a8a6bb91f01c149957448a0d77d62bd5c86a4b3cab341dd875bec0ed7f119eb27ffc969116e9b7e75466cb5b693fce1113b8f5e530fc48e356bfd6feb7b1
7
- data.tar.gz: ec9612cec15a2fd44b134f12f5cc5b4ad2dc75e68c7fd70a3b6ba83a1655761152546c43426e5ab0eaec745b42af04404e8975c9c46c6ebe4dac5fb174c2674e
6
+ metadata.gz: 447502e6968e6bbac24ece54fdf4e60a4b38bfccf32d30f0cd393a94234b3647b49c7349ccbcf904cf0909165cd10f398b940481a73ce70a3b69f8ef063f0c9e
7
+ data.tar.gz: 20346467bbb5a918d1cd46e40945e1e23c7c91582a3d7f0a1e790129a9e0f224e855e43d4aaa4bfdea142dd44a52686351a02ede10bcf09fc7638dfe041fb28e
data/Gemfile CHANGED
@@ -5,4 +5,9 @@ gemspec
5
5
  Faalis = [File.expand_path(File.dirname(__FILE__)),
6
6
  '../Faalis/'].join("/")
7
7
 
8
+ group :development, :test do
9
+ gem 'coffee-rails-source-maps'
10
+ gem 'sass-rails-source-maps'
11
+ end
12
+
8
13
  gem 'faalis', path: Faalis
@@ -41,8 +41,6 @@ ListView.directive('listView', ["$filter", "gettext", "UserPermissions", functio
41
41
  var _item_per_page = parseInt(scope.item_per_page, 10) || 10;
42
42
  var _current_page = 1;
43
43
 
44
- console.log("<<<<<<<<");
45
- console.log(scope.tools_processor);
46
44
  scope.list_view = true;
47
45
  scope.grid_view = false;
48
46
 
@@ -15,4 +15,5 @@ bootstrap3-wysihtml5
15
15
  //= require dashstrap/ltr/ltr
16
16
  //= require select2/select2
17
17
  //= require select2/select2-bootstrap
18
- //= require bootstrap-datetimepicker
18
+ //= require bootstrap-datetimepicker
19
+ //= require angular-loading-bar/loading-bar
@@ -65,4 +65,21 @@ $tools_link_color: #3f3f3f;
65
65
 
66
66
  .checkbox {
67
67
  padding-left: 20px;
68
- }
68
+ }
69
+
70
+ #loading-bar {
71
+ .bar {
72
+ background-color: #00c0ef !important;
73
+ }
74
+
75
+ .peg {
76
+ -moz-box-shadow: #00c0ef 1px 0 6px 1px !important;
77
+ -ms-box-shadow: #00c0ef 1px 0 6px 1px !important;
78
+ -webkit-box-shadow: #00c0ef 1px 0 6px 1px !important;
79
+ box-shadow: #00c0ef 1px 0 6px 1px !important;
80
+ }
81
+ }
82
+
83
+ #loading-bar-spinner {
84
+ display: none !important;
85
+ }
@@ -16,4 +16,5 @@ bootstrap3-wysihtml5
16
16
  //= require dashstrap/rtl/rtl
17
17
  //= require select2/select2
18
18
  //= require select2/select2-bootstrap
19
- //= require bootstrap-datetimepicker
19
+ //= require bootstrap-datetimepicker
20
+ //= require angular-loading-bar/loading-bar
@@ -1,2 +1,4 @@
1
+ h1
2
+ |aaa
1
3
  div[ui-view]
2
4
  list-view buttons="buttons" objects="groups" title-attribute="'name'" details-template="details_template" item-per-page="10" on_delete="on_delete"
@@ -34,7 +34,7 @@
34
34
  .box-title
35
35
  = _('Groups to use as template')
36
36
  .row
37
- .col-sm-9
37
+ .col-sm-12.col-lg-6
38
38
  .box.box-warning
39
39
  .box-header
40
40
  .box-title
@@ -46,11 +46,15 @@
46
46
  table.table.table-striped
47
47
  tbody
48
48
  tr
49
- th
49
+ th.col-md-4
50
50
  = _('Entity Name')
51
- th
51
+ th.col-md-8
52
52
  = _('Permission')
53
- tr ng-repeat="perm in resource.permissions.all()"
54
- th
55
- | {{ perm }}
56
- th
53
+
54
+ tr ng-repeat="(model, perm) in permissions"
55
+ td.col-md-4
56
+ | {{ model.readable() }}
57
+ td.col-md-8
58
+ form.form-inline
59
+ span.col-sm-3 ng-repeat="action in perm"
60
+ boolean-field field-name="action.humanize()" model="selected_permissions[model][action]" label="{{ action.humanize() | translate }}"
data/dashstrap.gemspec CHANGED
@@ -29,13 +29,11 @@ Gem::Specification.new do |spec|
29
29
  spec.add_dependency 'jquery-rails'
30
30
  spec.add_dependency 'font-awesome-rails'
31
31
  spec.add_dependency 'slim-rails'
32
-
33
32
  spec.add_dependency 'jquery-ui-rails'
34
33
  #spec.add_dependency 'rails-assets-angular-ui-bootstrap'
35
34
 
36
35
  spec.add_dependency 'select2-rails'
37
36
 
38
-
39
37
  spec.add_dependency 'momentjs-rails', '>= 2.8.1'
40
38
  spec.add_dependency 'bootstrap3-datetimepicker-rails', '~> 4.7'
41
39
  end
@@ -1,3 +1,3 @@
1
1
  module Dashstrap
2
- VERSION = '0.2.2'
2
+ VERSION = '0.2.3'
3
3
  end
data/lib/dashstrap.rb CHANGED
@@ -1,3 +1,5 @@
1
+ require 'slim-rails'
2
+
1
3
  module Dashstrap
2
4
  end
3
5
 
@@ -1,11 +1,11 @@
1
1
  // <%= resource.pluralize %> configuration section ---------------------------
2
- <%= resource.pluralize %>.config(["$stateProvider", function($stateProvider){
2
+ <%= resource.pluralize %>.config(["$stateProvider", "ResourcesProvider", function($stateProvider, ResourcesProvider){
3
3
  // Add any route you need here
4
4
  $stateProvider.
5
5
  state("<%= resource.pluralize.underscore %>", {
6
6
  url: "<% parents.each do |parent| %>/<%= parent %>/:<%= parent %>_id<% end %>/<%= resource_url %>",
7
7
  templateUrl: template_url("<%= resource_path %>/index"),
8
- controller: "<%= resource %>Controller"
8
+ controller: "Faalis.GenericIndexController"
9
9
  }).
10
10
  state("<%= resource.pluralize.underscore %>.new",{
11
11
  url: "/new",
@@ -17,4 +17,8 @@
17
17
  templateUrl: template("<%= resource_path %>/new"),
18
18
  controller: "Add<%= resource %>Controller"
19
19
  });
20
+
21
+ <%= resource.underscore %> = new Faalis.<%= resource.classify %>Resource()
22
+ ResourcesProvider.resources = [<%= resource.underscore %>]
23
+
20
24
  }]);