humdrum-rails 0.1.1 → 0.1.2
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 +4 -4
- data/README.md +212 -1
- data/humdrum-rails.gemspec +1 -1
- data/lib/humdrum/version.rb +1 -1
- data/lib/rails/generators/humdrum/api/templates/models/resource.rb +8 -8
- data/lib/rails/generators/humdrum/layout/layout_generator.rb +37 -37
- data/lib/rails/generators/humdrum/layout/templates/controllers/application_controller.rb +7 -3
- data/lib/rails/generators/humdrum/layout/templates/helpers/display_helper.rb +4 -12
- data/lib/rails/generators/humdrum/layout/templates/helpers/params_parser_helper.rb +1 -16
- data/lib/rails/generators/humdrum/layout/templates/stylesheets/application.css +6 -5
- data/lib/rails/generators/humdrum/layout/templates/stylesheets/bootstrap3/overrides-bootstrap.css +9 -6
- data/lib/rails/generators/humdrum/layout/templates/views/bootstrap2/layouts/application.html.erb +14 -14
- data/lib/rails/generators/humdrum/layout/templates/views/bootstrap2/layouts/common/_flash_message.html.erb +4 -4
- data/lib/rails/generators/humdrum/layout/templates/views/bootstrap2/layouts/layout_name.html.erb +15 -15
- data/lib/rails/generators/humdrum/layout/templates/views/bootstrap3/layouts/application/_header.html.erb +18 -33
- data/lib/rails/generators/humdrum/layout/templates/views/bootstrap3/layouts/application.html.erb +15 -15
- data/lib/rails/generators/humdrum/layout/templates/views/bootstrap3/layouts/common/_flash_message.html.erb +4 -4
- data/lib/rails/generators/humdrum/layout/templates/views/bootstrap3/layouts/layout_name.html.erb +15 -15
- data/lib/rails/generators/humdrum/layout/templates/views/gumby/layouts/application.html.erb +13 -13
- data/lib/rails/generators/humdrum/layout/templates/views/gumby/layouts/common/_flash_message.html.erb +4 -4
- data/lib/rails/generators/humdrum/layout/templates/views/gumby/layouts/layout_name.html.erb +13 -13
- data/lib/rails/generators/humdrum/resource/templates/controllers/resource_controller.rb +53 -49
- data/lib/rails/generators/humdrum/resource/templates/models/resource.rb +9 -11
- data/lib/rails/generators/humdrum/resource/templates/views/bootstrap2/resource/_edit.html.erb +2 -2
- data/lib/rails/generators/humdrum/resource/templates/views/bootstrap2/resource/_field.html.erb +7 -7
- data/lib/rails/generators/humdrum/resource/templates/views/bootstrap2/resource/_filters.html.erb +2 -2
- data/lib/rails/generators/humdrum/resource/templates/views/bootstrap2/resource/_form.html.erb +33 -33
- data/lib/rails/generators/humdrum/resource/templates/views/bootstrap2/resource/_index.html.erb +1 -1
- data/lib/rails/generators/humdrum/resource/templates/views/bootstrap2/resource/_item.html.erb +9 -9
- data/lib/rails/generators/humdrum/resource/templates/views/bootstrap2/resource/_nav_filters.html.erb +3 -3
- data/lib/rails/generators/humdrum/resource/templates/views/bootstrap2/resource/_new.html.erb +2 -2
- data/lib/rails/generators/humdrum/resource/templates/views/bootstrap2/resource/_show.html.erb +13 -13
- data/lib/rails/generators/humdrum/resource/templates/views/bootstrap2/resource/_summary.html.erb +1 -1
- data/lib/rails/generators/humdrum/resource/templates/views/bootstrap2/resource/index.html.erb +6 -6
- data/lib/rails/generators/humdrum/resource/templates/views/bootstrap2/resource/index.js.erb +3 -3
- data/lib/rails/generators/humdrum/resource/templates/views/bootstrap3/resource/_drop_down.html.erb +1 -1
- data/lib/rails/generators/humdrum/resource/templates/views/bootstrap3/resource/_edit.html.erb +2 -2
- data/lib/rails/generators/humdrum/resource/templates/views/bootstrap3/resource/_field.html.erb +12 -12
- data/lib/rails/generators/humdrum/resource/templates/views/bootstrap3/resource/_filters.html.erb +5 -5
- data/lib/rails/generators/humdrum/resource/templates/views/bootstrap3/resource/_form.html.erb +21 -21
- data/lib/rails/generators/humdrum/resource/templates/views/bootstrap3/resource/_index.html.erb +1 -1
- data/lib/rails/generators/humdrum/resource/templates/views/bootstrap3/resource/_item.html.erb +15 -15
- data/lib/rails/generators/humdrum/resource/templates/views/bootstrap3/resource/_nav_filters.html.erb +3 -3
- data/lib/rails/generators/humdrum/resource/templates/views/bootstrap3/resource/_new.html.erb +2 -2
- data/lib/rails/generators/humdrum/resource/templates/views/bootstrap3/resource/_show.html.erb +20 -20
- data/lib/rails/generators/humdrum/resource/templates/views/bootstrap3/resource/_summary.html.erb +1 -1
- data/lib/rails/generators/humdrum/resource/templates/views/bootstrap3/resource/destroy.js.erb +4 -4
- data/lib/rails/generators/humdrum/resource/templates/views/bootstrap3/resource/index.html.erb +7 -7
- data/lib/rails/generators/humdrum/resource/templates/views/bootstrap3/resource/index.js.erb +3 -3
- data/lib/rails/generators/humdrum/resource/templates/views/gumby/resource/_edit.html.erb +2 -2
- data/lib/rails/generators/humdrum/resource/templates/views/gumby/resource/_field.html.erb +7 -7
- data/lib/rails/generators/humdrum/resource/templates/views/gumby/resource/_filters.html.erb +1 -1
- data/lib/rails/generators/humdrum/resource/templates/views/gumby/resource/_form.html copy.erb +13 -13
- data/lib/rails/generators/humdrum/resource/templates/views/gumby/resource/_form.html.erb +18 -18
- data/lib/rails/generators/humdrum/resource/templates/views/gumby/resource/_index.html.erb +1 -1
- data/lib/rails/generators/humdrum/resource/templates/views/gumby/resource/_item.html.erb +9 -9
- data/lib/rails/generators/humdrum/resource/templates/views/gumby/resource/_nav_filters.html.erb +3 -3
- data/lib/rails/generators/humdrum/resource/templates/views/gumby/resource/_new.html.erb +2 -2
- data/lib/rails/generators/humdrum/resource/templates/views/gumby/resource/_show.html.erb +19 -19
- data/lib/rails/generators/humdrum/resource/templates/views/gumby/resource/_summary.html.erb +1 -1
- data/lib/rails/generators/humdrum/resource/templates/views/gumby/resource/index.html.erb +6 -6
- data/lib/rails/generators/humdrum/resource/templates/views/gumby/resource/index.js.erb +3 -3
- data/lib/rails/generators/humdrum/setup/setup_generator.rb +21 -26
- data/lib/rails/generators/humdrum/setup/templates/config/database.example.sql +17 -40
- data/lib/rails/generators/humdrum/setup/templates/config/database.sql +16 -38
- metadata +6 -6
@@ -5,19 +5,19 @@
|
|
5
5
|
flash_message = flash.now[:success] || flash.now[:notice] || flash.now[:alert]
|
6
6
|
style_classes = ""
|
7
7
|
else
|
8
|
-
style_classes = "
|
8
|
+
style_classes = "mt-10 mb-5 ml-40 mr-40"
|
9
9
|
flash_message = flash[:success] || flash[:notice] || flash[:alert]
|
10
10
|
end
|
11
11
|
cls_name = "alert"
|
12
12
|
cls_name = 'alert-success' if flash.now[:success] || flash[:success]
|
13
13
|
cls_name = 'alert-notice' if flash.now[:notice] || flash[:notice]
|
14
14
|
cls_name = 'alert-error' if flash.now[:alert] || flash[:alert]
|
15
|
-
|
15
|
+
|
16
16
|
flash_message = flash_message.strip if flash_message
|
17
|
-
|
17
|
+
|
18
18
|
%>
|
19
19
|
<%% unless flash_message.blank? %>
|
20
|
-
<div class="<%%= style_classes %> alert <%%= cls_name %> fade in" data-alert="alert" style="
|
20
|
+
<div class="<%%= style_classes %> alert <%%= cls_name %> fade in" data-alert="alert" style="m-bottom:5px;">
|
21
21
|
<a class="close" data-dismiss='alert' href="#">×</a>
|
22
22
|
<p><%%= flash_message %></p>
|
23
23
|
</div>
|
data/lib/rails/generators/humdrum/layout/templates/views/bootstrap2/layouts/layout_name.html.erb
CHANGED
@@ -4,29 +4,29 @@
|
|
4
4
|
<!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]-->
|
5
5
|
<!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
|
6
6
|
<head>
|
7
|
-
|
7
|
+
|
8
8
|
<title><%%= title -%></title>
|
9
|
-
|
9
|
+
|
10
10
|
<%%= render :partial=>"/layouts/common/meta_tags" -%>
|
11
11
|
|
12
12
|
<!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
|
13
13
|
<link rel="icon" href="/assets/favicon.ico" type="image/png">
|
14
|
-
|
14
|
+
|
15
15
|
<%%= stylesheet_link_tag "application", :media => "all" -%>
|
16
|
-
|
16
|
+
|
17
17
|
<%%= csrf_meta_tags -%>
|
18
|
-
|
18
|
+
|
19
19
|
</head>
|
20
20
|
|
21
21
|
<body>
|
22
|
-
|
22
|
+
|
23
23
|
<!--[if lt IE 7]>
|
24
|
-
<p class="chromeframe">You are using an <strong>outdated</strong> browser.
|
25
|
-
Please <a href="http://browsehappy.com/">upgrade your browser</a> or
|
26
|
-
<a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a>
|
24
|
+
<p class="chromeframe">You are using an <strong>outdated</strong> browser.
|
25
|
+
Please <a href="http://browsehappy.com/">upgrade your browser</a> or
|
26
|
+
<a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a>
|
27
27
|
to improve your experience.</p>
|
28
28
|
<![endif]-->
|
29
|
-
|
29
|
+
|
30
30
|
<div class="header-block clearfix">
|
31
31
|
<div id="div_page_header">
|
32
32
|
<%%= render :partial=>"/layouts/<%= layout_name.underscore %>/header" -%>
|
@@ -35,19 +35,19 @@
|
|
35
35
|
<%%= render :partial=>"/layouts/<%= layout_name.underscore %>/navbar" -%>
|
36
36
|
</div>
|
37
37
|
</div>
|
38
|
-
|
38
|
+
|
39
39
|
<%%#* Show flash messages if controller has set any. -%>
|
40
40
|
<div id="div_flash_message">
|
41
41
|
<%%= render :partial=>"/layouts/common/flash_message" -%>
|
42
42
|
</div>
|
43
|
-
|
44
|
-
<div class="<%= container_class %>
|
43
|
+
|
44
|
+
<div class="<%= container_class %> pt-10" style="min-height:400px;">
|
45
45
|
<%%= yield %>
|
46
46
|
</div>
|
47
|
-
|
47
|
+
|
48
48
|
<%%#* Display Footer -%>
|
49
49
|
<%%= render :partial=>"/layouts/<%= layout_name.underscore %>/footer" -%>
|
50
|
-
|
50
|
+
|
51
51
|
<%%#* Display Hidden Overlays -%>
|
52
52
|
<%%= render :partial=>"/layouts/common/overlays" -%>
|
53
53
|
|
@@ -1,34 +1,19 @@
|
|
1
|
-
<div class="
|
2
|
-
<
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
</
|
17
|
-
|
18
|
-
<li class="dropdown">
|
19
|
-
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Joe Black <b class="caret"></b></a>
|
20
|
-
<ul class="dropdown-menu">
|
21
|
-
<li class="dropdown-header">Profile</li>
|
22
|
-
<li><a href="#">Update Profile</a></li>
|
23
|
-
<li><a href="#">Profile Settings</a></li>
|
24
|
-
<li><a href="#">Notifications Settings</a></li>
|
25
|
-
<li class="divider"></li>
|
26
|
-
<li><a href="#">Logout</a></li>
|
27
|
-
</ul>
|
28
|
-
</li>
|
29
|
-
|
30
|
-
</ul>
|
31
|
-
</div><!--/.nav-collapse -->
|
1
|
+
<div class="header">
|
2
|
+
<h3 class="text-muted pull-left"><%= application_name -%></h3>
|
3
|
+
<ul class="nav nav-pills pull-right">
|
4
|
+
<li><a href="#">About <%= application_name -%></a></li>
|
5
|
+
<li><a href="#">Contact Us</a></li>
|
6
|
+
<li class="dropdown">
|
7
|
+
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Joe Black <b class="caret"></b></a>
|
8
|
+
<ul class="dropdown-menu">
|
9
|
+
<li class="dropdown-header">Profile</li>
|
10
|
+
<li><a href="#">Update Profile</a></li>
|
11
|
+
<li><a href="#">Profile Settings</a></li>
|
12
|
+
<li><a href="#">Notifications Settings</a></li>
|
13
|
+
<li class="divider"></li>
|
14
|
+
<li><a href="#">Logout</a></li>
|
15
|
+
</ul>
|
16
|
+
</li>
|
17
|
+
</ul>
|
32
18
|
</div>
|
33
|
-
|
34
|
-
|
19
|
+
<div class="cl visible-xs" style="border:1px solid #c1c1c1;margin-bottom:20px"></div>
|
data/lib/rails/generators/humdrum/layout/templates/views/bootstrap3/layouts/application.html.erb
CHANGED
@@ -4,29 +4,29 @@
|
|
4
4
|
<!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]-->
|
5
5
|
<!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
|
6
6
|
<head>
|
7
|
-
|
7
|
+
|
8
8
|
<title><%%= title -%></title>
|
9
|
-
|
9
|
+
|
10
10
|
<%%= render :partial=>"/layouts/common/meta_tags" -%>
|
11
11
|
|
12
12
|
<!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
|
13
13
|
<link rel="icon" href="/assets/favicon.ico" type="image/png">
|
14
|
-
|
14
|
+
|
15
15
|
<%%= stylesheet_link_tag "application", :media => "all" -%>
|
16
|
-
|
16
|
+
|
17
17
|
<%%= csrf_meta_tags -%>
|
18
|
-
|
18
|
+
|
19
19
|
</head>
|
20
20
|
|
21
21
|
<body>
|
22
|
-
|
22
|
+
|
23
23
|
<!--[if lt IE 7]>
|
24
|
-
<p class="chromeframe">You are using an <strong>outdated</strong> browser.
|
25
|
-
Please <a href="http://browsehappy.com/">upgrade your browser</a> or
|
26
|
-
<a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a>
|
24
|
+
<p class="chromeframe">You are using an <strong>outdated</strong> browser.
|
25
|
+
Please <a href="http://browsehappy.com/">upgrade your browser</a> or
|
26
|
+
<a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a>
|
27
27
|
to improve your experience.</p>
|
28
28
|
<![endif]-->
|
29
|
-
|
29
|
+
|
30
30
|
<div class="container header-block clearfix">
|
31
31
|
<div id="div_page_header">
|
32
32
|
<%%= render :partial=>"/layouts/application/header" -%>
|
@@ -35,19 +35,19 @@
|
|
35
35
|
<%%= render :partial=>"/layouts/application/navbar" -%>
|
36
36
|
</div>
|
37
37
|
</div>
|
38
|
-
|
38
|
+
|
39
39
|
<%%#* Show flash messages if controller has set any. -%>
|
40
40
|
<div id="div_flash_message">
|
41
41
|
<%%= render :partial=>"/layouts/common/flash_message" -%>
|
42
42
|
</div>
|
43
|
-
|
44
|
-
<div class="container
|
43
|
+
|
44
|
+
<div class="container pt-10" style="min-height:400px;">
|
45
45
|
<%%= yield %>
|
46
46
|
</div>
|
47
|
-
|
47
|
+
|
48
48
|
<%%#* Display Footer -%>
|
49
49
|
<%%= render :partial=>"/layouts/application/footer" -%>
|
50
|
-
|
50
|
+
|
51
51
|
<%%#* Display Hidden Overlays -%>
|
52
52
|
<%%= render :partial=>"/layouts/common/overlays" -%>
|
53
53
|
|
@@ -10,13 +10,13 @@
|
|
10
10
|
cls_name = 'alert-success' if flash.now[:success] || flash[:success]
|
11
11
|
cls_name = 'alert-warning' if flash.now[:alert] || flash[:alert]
|
12
12
|
cls_name = 'alert-danger' if flash.now[:error] || flash[:error]
|
13
|
-
|
13
|
+
|
14
14
|
flash_message = flash_message.strip if flash_message
|
15
|
-
|
15
|
+
|
16
16
|
%>
|
17
|
-
|
17
|
+
|
18
18
|
<%% unless flash_message.blank? %>
|
19
|
-
<div class="<%%= style_classes %> alert <%%= cls_name %> fade in
|
19
|
+
<div class="<%%= style_classes %> alert <%%= cls_name %> fade in mb-10" data-alert="alert">
|
20
20
|
<a class="close" data-dismiss='alert' href="#">×</a>
|
21
21
|
<p><%%= flash_message %></p>
|
22
22
|
</div>
|
data/lib/rails/generators/humdrum/layout/templates/views/bootstrap3/layouts/layout_name.html.erb
CHANGED
@@ -4,29 +4,29 @@
|
|
4
4
|
<!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]-->
|
5
5
|
<!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
|
6
6
|
<head>
|
7
|
-
|
7
|
+
|
8
8
|
<title><%%= title -%></title>
|
9
|
-
|
9
|
+
|
10
10
|
<%%= render :partial=>"/layouts/common/meta_tags" -%>
|
11
11
|
|
12
12
|
<!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
|
13
13
|
<link rel="icon" href="/assets/favicon.ico" type="image/png">
|
14
|
-
|
14
|
+
|
15
15
|
<%%= stylesheet_link_tag "application", :media => "all" -%>
|
16
|
-
|
16
|
+
|
17
17
|
<%%= csrf_meta_tags -%>
|
18
|
-
|
18
|
+
|
19
19
|
</head>
|
20
20
|
|
21
21
|
<body>
|
22
|
-
|
22
|
+
|
23
23
|
<!--[if lt IE 7]>
|
24
|
-
<p class="chromeframe">You are using an <strong>outdated</strong> browser.
|
25
|
-
Please <a href="http://browsehappy.com/">upgrade your browser</a> or
|
26
|
-
<a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a>
|
24
|
+
<p class="chromeframe">You are using an <strong>outdated</strong> browser.
|
25
|
+
Please <a href="http://browsehappy.com/">upgrade your browser</a> or
|
26
|
+
<a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a>
|
27
27
|
to improve your experience.</p>
|
28
28
|
<![endif]-->
|
29
|
-
|
29
|
+
|
30
30
|
<div class="container header-block clearfix">
|
31
31
|
<div id="div_page_header">
|
32
32
|
<%%= render :partial=>"/layouts/<%= layout_name.underscore %>/header" -%>
|
@@ -35,19 +35,19 @@
|
|
35
35
|
<%%= render :partial=>"/layouts/<%= layout_name.underscore %>/navbar" -%>
|
36
36
|
</div>
|
37
37
|
</div>
|
38
|
-
|
38
|
+
|
39
39
|
<%%#* Show flash messages if controller has set any. -%>
|
40
40
|
<div id="div_flash_message">
|
41
41
|
<%%= render :partial=>"/layouts/common/flash_message" -%>
|
42
42
|
</div>
|
43
|
-
|
44
|
-
<div class="container
|
43
|
+
|
44
|
+
<div class="container pt-10" style="min-height:400px;">
|
45
45
|
<%%= yield %>
|
46
46
|
</div>
|
47
|
-
|
47
|
+
|
48
48
|
<%%#* Display Footer -%>
|
49
49
|
<%%= render :partial=>"/layouts/<%= layout_name.underscore %>/footer" -%>
|
50
|
-
|
50
|
+
|
51
51
|
<%%#* Display Hidden Overlays -%>
|
52
52
|
<%%= render :partial=>"/layouts/common/overlays" -%>
|
53
53
|
|
@@ -4,9 +4,9 @@
|
|
4
4
|
<!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]-->
|
5
5
|
<!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
|
6
6
|
<head>
|
7
|
-
|
7
|
+
|
8
8
|
<title><%%= title -%></title>
|
9
|
-
|
9
|
+
|
10
10
|
<%%= render :partial=>"/layouts/common/meta_tags" -%>
|
11
11
|
|
12
12
|
<!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
|
@@ -15,18 +15,18 @@
|
|
15
15
|
<%%= stylesheet_link_tag "application", :media => "all" -%>
|
16
16
|
|
17
17
|
<%%= csrf_meta_tags -%>
|
18
|
-
|
18
|
+
|
19
19
|
</head>
|
20
20
|
|
21
21
|
<body>
|
22
|
-
|
22
|
+
|
23
23
|
<!--[if lt IE 7]>
|
24
|
-
<p class="chromeframe">You are using an <strong>outdated</strong> browser.
|
25
|
-
Please <a href="http://browsehappy.com/">upgrade your browser</a> or
|
26
|
-
<a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a>
|
24
|
+
<p class="chromeframe">You are using an <strong>outdated</strong> browser.
|
25
|
+
Please <a href="http://browsehappy.com/">upgrade your browser</a> or
|
26
|
+
<a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a>
|
27
27
|
to improve your experience.</p>
|
28
28
|
<![endif]-->
|
29
|
-
|
29
|
+
|
30
30
|
<div class="header-block clearfix">
|
31
31
|
<div id="div_page_header">
|
32
32
|
<%%= render :partial=>"/layouts/application/header" -%>
|
@@ -35,19 +35,19 @@
|
|
35
35
|
<%%= render :partial=>"/layouts/application/navbar" -%>
|
36
36
|
</div>
|
37
37
|
</div>
|
38
|
-
|
38
|
+
|
39
39
|
<%%#* Show flash messages if controller has set any. -%>
|
40
40
|
<div id="div_flash_message">
|
41
41
|
<%%= render :partial=>"/layouts/common/flash_message" -%>
|
42
42
|
</div>
|
43
|
-
|
44
|
-
<div class="<%= container_class %>
|
43
|
+
|
44
|
+
<div class="<%= container_class %> pt-10" style="min-height:400px;">
|
45
45
|
<%%= yield %>
|
46
46
|
</div>
|
47
|
-
|
47
|
+
|
48
48
|
<%%#* Display Footer -%>
|
49
49
|
<%%= render :partial=>"/layouts/application/footer" -%>
|
50
|
-
|
50
|
+
|
51
51
|
<%%#* Display Hidden Overlays -%>
|
52
52
|
<%%= render :partial=>"/layouts/common/overlays" -%>
|
53
53
|
|
@@ -5,19 +5,19 @@
|
|
5
5
|
flash_message = flash.now[:success] || flash.now[:notice] || flash.now[:alert]
|
6
6
|
style_classes = ""
|
7
7
|
else
|
8
|
-
style_classes = "
|
8
|
+
style_classes = "mt-10 mb-5 ml-40 mr-40"
|
9
9
|
flash_message = flash[:success] || flash[:notice] || flash[:alert]
|
10
10
|
end
|
11
11
|
cls_name = "alert"
|
12
12
|
cls_name = 'alert success' if flash.now[:success] || flash[:success]
|
13
13
|
cls_name = 'alert warning' if flash.now[:notice] || flash[:notice]
|
14
14
|
cls_name = 'alert danger' if flash.now[:alert] || flash[:alert]
|
15
|
-
|
15
|
+
|
16
16
|
flash_message = flash_message.strip if flash_message
|
17
|
-
|
17
|
+
|
18
18
|
%>
|
19
19
|
<%% unless flash_message.blank? %>
|
20
|
-
<div class="<%%= style_classes %> <%%= cls_name %> fade in" data-alert="alert" style="
|
20
|
+
<div class="<%%= style_classes %> <%%= cls_name %> fade in" data-alert="alert" style="m-bottom:5px;">
|
21
21
|
<%%= flash_message %>
|
22
22
|
</div>
|
23
23
|
<%% end %>
|
@@ -4,9 +4,9 @@
|
|
4
4
|
<!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]-->
|
5
5
|
<!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
|
6
6
|
<head>
|
7
|
-
|
7
|
+
|
8
8
|
<title><%%= title -%></title>
|
9
|
-
|
9
|
+
|
10
10
|
<%%= render :partial=>"/layouts/common/meta_tags" -%>
|
11
11
|
|
12
12
|
<!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
|
@@ -15,18 +15,18 @@
|
|
15
15
|
<%%= stylesheet_link_tag "application", :media => "all" -%>
|
16
16
|
|
17
17
|
<%%= csrf_meta_tags -%>
|
18
|
-
|
18
|
+
|
19
19
|
</head>
|
20
20
|
|
21
21
|
<body>
|
22
|
-
|
22
|
+
|
23
23
|
<!--[if lt IE 7]>
|
24
|
-
<p class="chromeframe">You are using an <strong>outdated</strong> browser.
|
25
|
-
Please <a href="http://browsehappy.com/">upgrade your browser</a> or
|
26
|
-
<a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a>
|
24
|
+
<p class="chromeframe">You are using an <strong>outdated</strong> browser.
|
25
|
+
Please <a href="http://browsehappy.com/">upgrade your browser</a> or
|
26
|
+
<a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a>
|
27
27
|
to improve your experience.</p>
|
28
28
|
<![endif]-->
|
29
|
-
|
29
|
+
|
30
30
|
<div class="header-block clearfix">
|
31
31
|
<div id="div_page_header">
|
32
32
|
<%%= render :partial=>"/layouts/<%= layout_name.underscore %>/header" -%>
|
@@ -35,19 +35,19 @@
|
|
35
35
|
<%%= render :partial=>"/layouts/<%= layout_name.underscore %>/navbar" -%>
|
36
36
|
</div>
|
37
37
|
</div>
|
38
|
-
|
38
|
+
|
39
39
|
<%%#* Show flash messages if controller has set any. -%>
|
40
40
|
<div id="div_flash_message">
|
41
41
|
<%%= render :partial=>"/layouts/common/flash_message" -%>
|
42
42
|
</div>
|
43
|
-
|
44
|
-
<div class="<%= container_class %>
|
43
|
+
|
44
|
+
<div class="<%= container_class %> pt-10" style="min-height:400px;">
|
45
45
|
<%%= yield %>
|
46
46
|
</div>
|
47
|
-
|
47
|
+
|
48
48
|
<%%#* Display Footer -%>
|
49
49
|
<%%= render :partial=>"/layouts/<%= layout_name.underscore %>/footer" -%>
|
50
|
-
|
50
|
+
|
51
51
|
<%%#* Display Hidden Overlays -%>
|
52
52
|
<%%= render :partial=>"/layouts/common/overlays" -%>
|
53
53
|
|