app_frame 0.5.6 → 0.5.7
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/app/assets/stylesheets/app_frame/_forms.scss +20 -0
- data/app/assets/stylesheets/app_frame/_page_header.scss +15 -0
- data/app/assets/stylesheets/app_frame/_sidenav.scss +25 -0
- data/app/assets/stylesheets/app_frame/application.scss +7 -33
- data/app/helpers/app_frame/layout_helper.rb +29 -0
- data/app/views/app_frame/devise/registrations/edit.html.haml +1 -1
- data/app/views/application/_sidenav.html.haml +0 -0
- data/app/views/application/_toolbar.html.haml +2 -4
- data/app/views/application/index.html.haml +2 -1
- data/app/views/layouts/app_frame/default.html.haml +12 -15
- data/app_frame.gemspec +7 -3
- metadata +8 -4
- data/Gemfile.lock +0 -212
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.5.
|
1
|
+
0.5.7
|
@@ -0,0 +1,20 @@
|
|
1
|
+
select {
|
2
|
+
width: auto;
|
3
|
+
}
|
4
|
+
|
5
|
+
input[type=text], input[type=url], textarea, .cke_skin_kama {
|
6
|
+
width: 700px;
|
7
|
+
}
|
8
|
+
|
9
|
+
input.search-query {
|
10
|
+
width: 300px;
|
11
|
+
}
|
12
|
+
|
13
|
+
.select2-container {
|
14
|
+
width: 700px;
|
15
|
+
}
|
16
|
+
|
17
|
+
select.date {
|
18
|
+
width: auto;
|
19
|
+
}
|
20
|
+
|
@@ -0,0 +1,25 @@
|
|
1
|
+
$sidenav_size: 180px;
|
2
|
+
|
3
|
+
#sidenav {
|
4
|
+
position: fixed;
|
5
|
+
width: $sidenav_size;
|
6
|
+
left: 0;
|
7
|
+
top: 40px;
|
8
|
+
bottom: 0;
|
9
|
+
background-color: #f2f7fa;
|
10
|
+
border-right: 1px solid #eee;
|
11
|
+
padding: 10px 0;
|
12
|
+
overflow-y: auto;
|
13
|
+
}
|
14
|
+
|
15
|
+
.with-sidenav {
|
16
|
+
#main {
|
17
|
+
padding-left: $sidenav_size + 20px;
|
18
|
+
}
|
19
|
+
|
20
|
+
.page-header {
|
21
|
+
left: $sidenav_size + 1px;
|
22
|
+
}
|
23
|
+
|
24
|
+
}
|
25
|
+
|
@@ -4,10 +4,13 @@
|
|
4
4
|
*/
|
5
5
|
|
6
6
|
@import 'bootstrap';
|
7
|
-
#main, .sidebar { margin-top:
|
7
|
+
#main, .sidebar { margin-top:110px; }
|
8
8
|
@import 'bootstrap-responsive';
|
9
9
|
@import 'tree';
|
10
10
|
@import 'devise';
|
11
|
+
@import 'forms';
|
12
|
+
@import 'sidenav';
|
13
|
+
@import 'page_header';
|
11
14
|
|
12
15
|
.container-fluid > .sidebar {
|
13
16
|
position: absolute;
|
@@ -22,44 +25,15 @@
|
|
22
25
|
margin-right: 280px;
|
23
26
|
}
|
24
27
|
|
25
|
-
table .
|
26
|
-
width:
|
27
|
-
|
28
|
-
|
29
|
-
td.last {
|
30
|
-
text-align:center;
|
31
|
-
}
|
32
|
-
|
33
|
-
select {
|
34
|
-
width: auto;
|
35
|
-
}
|
36
|
-
|
37
|
-
.page-actions {
|
38
|
-
float: right;
|
39
|
-
padding-top: 4px;
|
28
|
+
table .actions {
|
29
|
+
width: 1%;
|
30
|
+
white-space:nowrap;
|
40
31
|
}
|
41
32
|
|
42
33
|
.page-range {
|
43
34
|
float: right;
|
44
35
|
}
|
45
36
|
|
46
|
-
|
47
|
-
input[type=text], input[type=url], textarea, select, .cke_skin_kama {
|
48
|
-
width: 700px;
|
49
|
-
}
|
50
|
-
|
51
|
-
input.search-query {
|
52
|
-
width: 300px;
|
53
|
-
}
|
54
|
-
|
55
|
-
.select2-container {
|
56
|
-
width: 700px;
|
57
|
-
}
|
58
|
-
|
59
|
-
select.date {
|
60
|
-
width: auto;
|
61
|
-
}
|
62
|
-
|
63
37
|
.btn-toolbar {
|
64
38
|
margin-bottom: 20px;
|
65
39
|
form {
|
@@ -0,0 +1,29 @@
|
|
1
|
+
module AppFrame::LayoutHelper
|
2
|
+
def sidenav
|
3
|
+
@sidenav ||= render 'sidenav'
|
4
|
+
end
|
5
|
+
|
6
|
+
def sidenav?
|
7
|
+
sidenav.present?
|
8
|
+
end
|
9
|
+
|
10
|
+
def sidebar
|
11
|
+
@sidebar ||= render 'sidebar'
|
12
|
+
end
|
13
|
+
|
14
|
+
def sidebar?
|
15
|
+
sidebar.present?
|
16
|
+
end
|
17
|
+
|
18
|
+
def content_cols
|
19
|
+
@content_cols = 12
|
20
|
+
#@content_cols -= 2 if sidenav?
|
21
|
+
@content_cols -= 2 if sidebar?
|
22
|
+
@content_cols
|
23
|
+
end
|
24
|
+
|
25
|
+
def body_class
|
26
|
+
"with-sidenav" if sidenav?
|
27
|
+
end
|
28
|
+
|
29
|
+
end
|
File without changes
|
@@ -1,7 +1,5 @@
|
|
1
1
|
.btn-toolbar
|
2
|
-
.btn-group
|
3
|
-
= link_to("New #{resource_name}", new_resource_url, :class => 'btn')
|
4
2
|
- if searchable?
|
5
|
-
.btn-group
|
3
|
+
.btn-group
|
6
4
|
= form_for collection_url, :class => "form-search", :method => :get do
|
7
|
-
= text_field_tag 'q', params[:q], :class => "search-query"
|
5
|
+
= text_field_tag 'q', params[:q], :class => "search-query", :placeholder => 'Search'
|
@@ -1,9 +1,8 @@
|
|
1
|
-
- sidebar = render 'sidebar'
|
2
1
|
!!! 5
|
3
2
|
%html
|
4
3
|
%head
|
5
4
|
= render 'head'
|
6
|
-
%body
|
5
|
+
%body{:class => body_class}
|
7
6
|
.navbar.navbar-inverse.navbar-fixed-top{:'data-dropdown'=>"dropdown"}
|
8
7
|
.navbar-inner
|
9
8
|
.container-fluid
|
@@ -19,19 +18,17 @@
|
|
19
18
|
= render 'secondary_menu'
|
20
19
|
|
21
20
|
#main.container-fluid
|
22
|
-
- if
|
23
|
-
|
24
|
-
|
25
|
-
|
21
|
+
- if sidenav?
|
22
|
+
#sidenav
|
23
|
+
= sidenav
|
24
|
+
.page-header
|
25
|
+
= render 'page_header'
|
26
|
+
.row-fluid
|
27
|
+
%span{:class => "span#{content_cols}"}
|
26
28
|
= render 'sub_menu'
|
27
29
|
= render 'flashes'
|
28
30
|
= yield
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
= render 'page_header'
|
34
|
-
= render 'sub_menu'
|
35
|
-
= render 'flashes'
|
36
|
-
= yield
|
37
|
-
|
31
|
+
- if sidebar?
|
32
|
+
.span2.sidebar
|
33
|
+
= sidebar
|
34
|
+
|
data/app_frame.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = "app_frame"
|
8
|
-
s.version = "0.5.
|
8
|
+
s.version = "0.5.7"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Mateo Murphy"]
|
12
|
-
s.date = "2013-
|
12
|
+
s.date = "2013-09-03"
|
13
13
|
s.description = "An app framework"
|
14
14
|
s.email = "mateo.murphy@gmail.com"
|
15
15
|
s.extra_rdoc_files = [
|
@@ -20,13 +20,15 @@ Gem::Specification.new do |s|
|
|
20
20
|
".document",
|
21
21
|
".rspec",
|
22
22
|
"Gemfile",
|
23
|
-
"Gemfile.lock",
|
24
23
|
"LICENSE.txt",
|
25
24
|
"README.md",
|
26
25
|
"Rakefile",
|
27
26
|
"VERSION",
|
28
27
|
"app/assets/javascripts/app_frame/application.js",
|
29
28
|
"app/assets/stylesheets/app_frame/_devise.scss",
|
29
|
+
"app/assets/stylesheets/app_frame/_forms.scss",
|
30
|
+
"app/assets/stylesheets/app_frame/_page_header.scss",
|
31
|
+
"app/assets/stylesheets/app_frame/_sidenav.scss",
|
30
32
|
"app/assets/stylesheets/app_frame/_tree.scss",
|
31
33
|
"app/assets/stylesheets/app_frame/application.scss",
|
32
34
|
"app/controllers/app_frame/devise/confirmations_controller.rb",
|
@@ -35,6 +37,7 @@ Gem::Specification.new do |s|
|
|
35
37
|
"app/controllers/app_frame/devise/sessions_controller.rb",
|
36
38
|
"app/helpers/app_frame/bootstrap_helper.rb",
|
37
39
|
"app/helpers/app_frame/breadcrumb_helper.rb",
|
40
|
+
"app/helpers/app_frame/layout_helper.rb",
|
38
41
|
"app/helpers/app_frame/menu_helper.rb",
|
39
42
|
"app/helpers/app_frame/pagination_helper.rb",
|
40
43
|
"app/helpers/app_frame/resources_helper.rb",
|
@@ -60,6 +63,7 @@ Gem::Specification.new do |s|
|
|
60
63
|
"app/views/application/_secondary_menu.html.haml",
|
61
64
|
"app/views/application/_show.html.haml",
|
62
65
|
"app/views/application/_sidebar.html.haml",
|
66
|
+
"app/views/application/_sidenav.html.haml",
|
63
67
|
"app/views/application/_sub_menu.html.haml",
|
64
68
|
"app/views/application/_table.html.haml",
|
65
69
|
"app/views/application/_toolbar.html.haml",
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: app_frame
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.5.
|
4
|
+
version: 0.5.7
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2013-
|
12
|
+
date: 2013-09-03 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: bootstrap-sass
|
@@ -326,13 +326,15 @@ files:
|
|
326
326
|
- .document
|
327
327
|
- .rspec
|
328
328
|
- Gemfile
|
329
|
-
- Gemfile.lock
|
330
329
|
- LICENSE.txt
|
331
330
|
- README.md
|
332
331
|
- Rakefile
|
333
332
|
- VERSION
|
334
333
|
- app/assets/javascripts/app_frame/application.js
|
335
334
|
- app/assets/stylesheets/app_frame/_devise.scss
|
335
|
+
- app/assets/stylesheets/app_frame/_forms.scss
|
336
|
+
- app/assets/stylesheets/app_frame/_page_header.scss
|
337
|
+
- app/assets/stylesheets/app_frame/_sidenav.scss
|
336
338
|
- app/assets/stylesheets/app_frame/_tree.scss
|
337
339
|
- app/assets/stylesheets/app_frame/application.scss
|
338
340
|
- app/controllers/app_frame/devise/confirmations_controller.rb
|
@@ -341,6 +343,7 @@ files:
|
|
341
343
|
- app/controllers/app_frame/devise/sessions_controller.rb
|
342
344
|
- app/helpers/app_frame/bootstrap_helper.rb
|
343
345
|
- app/helpers/app_frame/breadcrumb_helper.rb
|
346
|
+
- app/helpers/app_frame/layout_helper.rb
|
344
347
|
- app/helpers/app_frame/menu_helper.rb
|
345
348
|
- app/helpers/app_frame/pagination_helper.rb
|
346
349
|
- app/helpers/app_frame/resources_helper.rb
|
@@ -366,6 +369,7 @@ files:
|
|
366
369
|
- app/views/application/_secondary_menu.html.haml
|
367
370
|
- app/views/application/_show.html.haml
|
368
371
|
- app/views/application/_sidebar.html.haml
|
372
|
+
- app/views/application/_sidenav.html.haml
|
369
373
|
- app/views/application/_sub_menu.html.haml
|
370
374
|
- app/views/application/_table.html.haml
|
371
375
|
- app/views/application/_toolbar.html.haml
|
@@ -408,7 +412,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
408
412
|
version: '0'
|
409
413
|
segments:
|
410
414
|
- 0
|
411
|
-
hash: -
|
415
|
+
hash: -361774337552347466
|
412
416
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
413
417
|
none: false
|
414
418
|
requirements:
|
data/Gemfile.lock
DELETED
@@ -1,212 +0,0 @@
|
|
1
|
-
GIT
|
2
|
-
remote: git://github.com/ryanb/nested_form.git
|
3
|
-
revision: 42028bc06e72a848d297edc1467a969a7c9def57
|
4
|
-
specs:
|
5
|
-
nested_form (0.3.2)
|
6
|
-
|
7
|
-
GEM
|
8
|
-
remote: http://rubygems.org/
|
9
|
-
specs:
|
10
|
-
actionmailer (3.2.14)
|
11
|
-
actionpack (= 3.2.14)
|
12
|
-
mail (~> 2.5.4)
|
13
|
-
actionpack (3.2.14)
|
14
|
-
activemodel (= 3.2.14)
|
15
|
-
activesupport (= 3.2.14)
|
16
|
-
builder (~> 3.0.0)
|
17
|
-
erubis (~> 2.7.0)
|
18
|
-
journey (~> 1.0.4)
|
19
|
-
rack (~> 1.4.5)
|
20
|
-
rack-cache (~> 1.2)
|
21
|
-
rack-test (~> 0.6.1)
|
22
|
-
sprockets (~> 2.2.1)
|
23
|
-
activemodel (3.2.14)
|
24
|
-
activesupport (= 3.2.14)
|
25
|
-
builder (~> 3.0.0)
|
26
|
-
activerecord (3.2.14)
|
27
|
-
activemodel (= 3.2.14)
|
28
|
-
activesupport (= 3.2.14)
|
29
|
-
arel (~> 3.0.2)
|
30
|
-
tzinfo (~> 0.3.29)
|
31
|
-
activeresource (3.2.14)
|
32
|
-
activemodel (= 3.2.14)
|
33
|
-
activesupport (= 3.2.14)
|
34
|
-
activesupport (3.2.14)
|
35
|
-
i18n (~> 0.6, >= 0.6.4)
|
36
|
-
multi_json (~> 1.0)
|
37
|
-
addressable (2.3.5)
|
38
|
-
arel (3.0.2)
|
39
|
-
bcrypt-ruby (3.1.1)
|
40
|
-
bootstrap-sass (2.3.2.1)
|
41
|
-
sass (~> 3.2)
|
42
|
-
builder (3.0.4)
|
43
|
-
devise (3.0.3)
|
44
|
-
bcrypt-ruby (~> 3.0)
|
45
|
-
orm_adapter (~> 0.1)
|
46
|
-
railties (>= 3.2.6, < 5)
|
47
|
-
warden (~> 1.2.3)
|
48
|
-
diff-lcs (1.2.4)
|
49
|
-
display_for (0.1.12)
|
50
|
-
erubis (2.7.0)
|
51
|
-
faraday (0.8.8)
|
52
|
-
multipart-post (~> 1.2.0)
|
53
|
-
git (1.2.6)
|
54
|
-
github_api (0.10.1)
|
55
|
-
addressable
|
56
|
-
faraday (~> 0.8.1)
|
57
|
-
hashie (>= 1.2)
|
58
|
-
multi_json (~> 1.4)
|
59
|
-
nokogiri (~> 1.5.2)
|
60
|
-
oauth2
|
61
|
-
haml (4.0.3)
|
62
|
-
tilt
|
63
|
-
haml-rails (0.4)
|
64
|
-
actionpack (>= 3.1, < 4.1)
|
65
|
-
activesupport (>= 3.1, < 4.1)
|
66
|
-
haml (>= 3.1, < 4.1)
|
67
|
-
railties (>= 3.1, < 4.1)
|
68
|
-
has_scope (0.6.0.rc)
|
69
|
-
actionpack (>= 3.2, < 5)
|
70
|
-
activesupport (>= 3.2, < 5)
|
71
|
-
hashie (2.0.5)
|
72
|
-
highline (1.6.19)
|
73
|
-
hike (1.2.3)
|
74
|
-
httpauth (0.2.0)
|
75
|
-
i18n (0.6.5)
|
76
|
-
inherited_resources (1.4.1)
|
77
|
-
has_scope (~> 0.6.0.rc)
|
78
|
-
responders (~> 1.0.0.rc)
|
79
|
-
jeweler (1.8.7)
|
80
|
-
builder
|
81
|
-
bundler (~> 1.0)
|
82
|
-
git (>= 1.2.5)
|
83
|
-
github_api (= 0.10.1)
|
84
|
-
highline (>= 1.6.15)
|
85
|
-
nokogiri (= 1.5.10)
|
86
|
-
rake
|
87
|
-
rdoc
|
88
|
-
journey (1.0.4)
|
89
|
-
json (1.8.0)
|
90
|
-
jwt (0.1.8)
|
91
|
-
multi_json (>= 1.5)
|
92
|
-
kaminari (0.14.1)
|
93
|
-
actionpack (>= 3.0.0)
|
94
|
-
activesupport (>= 3.0.0)
|
95
|
-
log_buddy (0.7.0)
|
96
|
-
mail (2.5.4)
|
97
|
-
mime-types (~> 1.16)
|
98
|
-
treetop (~> 1.4.8)
|
99
|
-
mime-types (1.24)
|
100
|
-
multi_json (1.7.9)
|
101
|
-
multi_xml (0.5.5)
|
102
|
-
multipart-post (1.2.0)
|
103
|
-
nested_set (1.7.1)
|
104
|
-
activerecord (>= 3.0.0)
|
105
|
-
railties (>= 3.0.0)
|
106
|
-
nokogiri (1.5.10)
|
107
|
-
oauth2 (0.9.2)
|
108
|
-
faraday (~> 0.8)
|
109
|
-
httpauth (~> 0.2)
|
110
|
-
jwt (~> 0.1.4)
|
111
|
-
multi_json (~> 1.0)
|
112
|
-
multi_xml (~> 0.5)
|
113
|
-
rack (~> 1.2)
|
114
|
-
orm_adapter (0.4.0)
|
115
|
-
polyamorous (0.6.3)
|
116
|
-
activerecord (>= 3.0)
|
117
|
-
polyglot (0.3.3)
|
118
|
-
rack (1.4.5)
|
119
|
-
rack-cache (1.2)
|
120
|
-
rack (>= 0.4)
|
121
|
-
rack-ssl (1.3.3)
|
122
|
-
rack
|
123
|
-
rack-test (0.6.2)
|
124
|
-
rack (>= 1.0)
|
125
|
-
rails (3.2.14)
|
126
|
-
actionmailer (= 3.2.14)
|
127
|
-
actionpack (= 3.2.14)
|
128
|
-
activerecord (= 3.2.14)
|
129
|
-
activeresource (= 3.2.14)
|
130
|
-
activesupport (= 3.2.14)
|
131
|
-
bundler (~> 1.0)
|
132
|
-
railties (= 3.2.14)
|
133
|
-
railties (3.2.14)
|
134
|
-
actionpack (= 3.2.14)
|
135
|
-
activesupport (= 3.2.14)
|
136
|
-
rack-ssl (~> 1.3.2)
|
137
|
-
rake (>= 0.8.7)
|
138
|
-
rdoc (~> 3.4)
|
139
|
-
thor (>= 0.14.6, < 2.0)
|
140
|
-
rake (10.1.0)
|
141
|
-
rdoc (3.12.2)
|
142
|
-
json (~> 1.4)
|
143
|
-
responders (1.0.0.rc)
|
144
|
-
railties (>= 3.2, < 5)
|
145
|
-
rspec-core (2.14.5)
|
146
|
-
rspec-expectations (2.14.2)
|
147
|
-
diff-lcs (>= 1.1.3, < 2.0)
|
148
|
-
rspec-mocks (2.14.3)
|
149
|
-
rspec-rails (2.14.0)
|
150
|
-
actionpack (>= 3.0)
|
151
|
-
activesupport (>= 3.0)
|
152
|
-
railties (>= 3.0)
|
153
|
-
rspec-core (~> 2.14.0)
|
154
|
-
rspec-expectations (~> 2.14.0)
|
155
|
-
rspec-mocks (~> 2.14.0)
|
156
|
-
sass (3.2.10)
|
157
|
-
sass-rails (3.2.6)
|
158
|
-
railties (~> 3.2.0)
|
159
|
-
sass (>= 3.1.10)
|
160
|
-
tilt (~> 1.3)
|
161
|
-
select2-rails (3.4.8)
|
162
|
-
sass-rails
|
163
|
-
thor (~> 0.14)
|
164
|
-
settingslogic (2.0.9)
|
165
|
-
simple_form (2.1.0)
|
166
|
-
actionpack (~> 3.0)
|
167
|
-
activemodel (~> 3.0)
|
168
|
-
simplecov (0.7.1)
|
169
|
-
multi_json (~> 1.0)
|
170
|
-
simplecov-html (~> 0.7.1)
|
171
|
-
simplecov-html (0.7.1)
|
172
|
-
sprockets (2.2.2)
|
173
|
-
hike (~> 1.2)
|
174
|
-
multi_json (~> 1.0)
|
175
|
-
rack (~> 1.0)
|
176
|
-
tilt (~> 1.1, != 1.3.0)
|
177
|
-
squeel (1.1.0)
|
178
|
-
activerecord (>= 3.0)
|
179
|
-
activesupport (>= 3.0)
|
180
|
-
polyamorous (~> 0.6.0)
|
181
|
-
thor (0.18.1)
|
182
|
-
tilt (1.4.1)
|
183
|
-
treetop (1.4.15)
|
184
|
-
polyglot
|
185
|
-
polyglot (>= 0.3.1)
|
186
|
-
tzinfo (0.3.37)
|
187
|
-
warden (1.2.3)
|
188
|
-
rack (>= 1.0)
|
189
|
-
|
190
|
-
PLATFORMS
|
191
|
-
ruby
|
192
|
-
|
193
|
-
DEPENDENCIES
|
194
|
-
bootstrap-sass (~> 2.3.2.1)
|
195
|
-
bundler (~> 1.3.4)
|
196
|
-
devise
|
197
|
-
display_for (= 0.1.12)
|
198
|
-
haml-rails
|
199
|
-
inherited_resources
|
200
|
-
jeweler (~> 1.8.7)
|
201
|
-
kaminari
|
202
|
-
log_buddy
|
203
|
-
nested_form!
|
204
|
-
nested_set
|
205
|
-
rails (~> 3.2.14)
|
206
|
-
rspec-rails
|
207
|
-
sass-rails
|
208
|
-
select2-rails
|
209
|
-
settingslogic
|
210
|
-
simple_form
|
211
|
-
simplecov
|
212
|
-
squeel
|