sbdevcore 0.3.2 → 0.3.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) hide show
  1. data/.idea/workspace.xml +60 -81
  2. data/app/assets/stylesheets/_bar_nav.scss +1 -8
  3. data/app/assets/stylesheets/_sbdev_core.scss +11 -24
  4. data/app/views/galleries/_show.html.haml +1 -0
  5. data/app/views/sbdev_core/index.html.haml +1 -0
  6. data/lib/generators/sbdevcore/install_generator.rb +1 -0
  7. data/lib/generators/sbdevcore/templates/application/_header.html.haml +1 -0
  8. data/{app/views/layouts → lib/generators/sbdevcore/templates/application}/application.html.haml +0 -0
  9. data/lib/generators/sbdevcore/templates/layouts/application.html.haml +26 -0
  10. data/lib/sbdevcore/version.rb +1 -1
  11. metadata +33 -32
  12. data/app/views/layouts/bar_nav.html.haml +0 -8
data/.idea/workspace.xml CHANGED
@@ -23,46 +23,28 @@
23
23
  <component name="FileColors" enabled="true" enabledForTabs="true" />
24
24
  <component name="FileEditorManager">
25
25
  <leaf>
26
- <file leaf-file-name="version.rb" pinned="false" current="true" current-in-tab="true">
27
- <entry file="file://$PROJECT_DIR$/lib/sbdevcore/version.rb">
28
- <provider selected="true" editor-type-id="text-editor">
29
- <state line="1" column="18" selection-start="35" selection-end="35" vertical-scroll-proportion="0.015873017">
30
- <folding />
31
- </state>
32
- </provider>
33
- </entry>
34
- </file>
35
- <file leaf-file-name="sbdevcore-tools.js" pinned="false" current="false" current-in-tab="false">
36
- <entry file="file://$PROJECT_DIR$/app/assets/javascripts/sbdevcore-tools.js">
37
- <provider selected="true" editor-type-id="text-editor">
38
- <state line="128" column="6" selection-start="3626" selection-end="3626" vertical-scroll-proportion="0.0">
39
- <folding />
40
- </state>
41
- </provider>
42
- </entry>
43
- </file>
44
- <file leaf-file-name="sbdevcore.js" pinned="false" current="false" current-in-tab="false">
45
- <entry file="file://$PROJECT_DIR$/app/assets/javascripts/sbdevcore.js">
26
+ <file leaf-file-name="index.html.haml" pinned="false" current="false" current-in-tab="false">
27
+ <entry file="file://$PROJECT_DIR$/app/views/sbdev_core/index.html.haml">
46
28
  <provider selected="true" editor-type-id="text-editor">
47
- <state line="14" column="26" selection-start="669" selection-end="669" vertical-scroll-proportion="0.0">
29
+ <state line="9" column="0" selection-start="345" selection-end="345" vertical-scroll-proportion="0.0">
48
30
  <folding />
49
31
  </state>
50
32
  </provider>
51
33
  </entry>
52
34
  </file>
53
- <file leaf-file-name="sbdev-ajax.js" pinned="false" current="false" current-in-tab="false">
54
- <entry file="file://$PROJECT_DIR$/app/assets/javascripts/sbdev-ajax.js">
35
+ <file leaf-file-name="version.rb" pinned="false" current="true" current-in-tab="true">
36
+ <entry file="file://$PROJECT_DIR$/lib/sbdevcore/version.rb">
55
37
  <provider selected="true" editor-type-id="text-editor">
56
- <state line="32" column="49" selection-start="1055" selection-end="1055" vertical-scroll-proportion="0.0">
38
+ <state line="1" column="18" selection-start="35" selection-end="35" vertical-scroll-proportion="0.024439918">
57
39
  <folding />
58
40
  </state>
59
41
  </provider>
60
42
  </entry>
61
43
  </file>
62
- <file leaf-file-name="sbdevcore.rb" pinned="false" current="false" current-in-tab="false">
63
- <entry file="file://$PROJECT_DIR$/lib/sbdevcore.rb">
44
+ <file leaf-file-name="show.html.haml" pinned="false" current="false" current-in-tab="false">
45
+ <entry file="file://$PROJECT_DIR$/app/views/sbdev_core/show.html.haml">
64
46
  <provider selected="true" editor-type-id="text-editor">
65
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
47
+ <state line="1" column="92" selection-start="127" selection-end="171" vertical-scroll-proportion="0.0">
66
48
  <folding />
67
49
  </state>
68
50
  </provider>
@@ -81,14 +63,8 @@
81
63
  <component name="IdeDocumentHistory">
82
64
  <option name="changedFiles">
83
65
  <list>
84
- <option value="$PROJECT_DIR$/app/controllers/indices_controller.rb" />
85
- <option value="$PROJECT_DIR$/db/migrate/20110811000613_create_indices.rb" />
86
- <option value="$PROJECT_DIR$/db/migrate/20110924202450_add_new.rb" />
87
- <option value="$PROJECT_DIR$/db/seeds.rb" />
88
66
  <option value="$PROJECT_DIR$/app/models/photo.rb" />
89
- <option value="$PROJECT_DIR$/app/views/galleries/_show.html.haml" />
90
67
  <option value="$PROJECT_DIR$/app/assets/javascripts/jquery.tools.min.js" />
91
- <option value="$PROJECT_DIR$/app/assets/stylesheets/_sbdev_core.scss" />
92
68
  <option value="$PROJECT_DIR$/app/views/indices/_show.html.haml" />
93
69
  <option value="$PROJECT_DIR$/app/assets/stylesheets/_gallery.scss" />
94
70
  <option value="$PROJECT_DIR$/app/views/photos/_form.html.haml" />
@@ -96,6 +72,12 @@
96
72
  <option value="$PROJECT_DIR$/app/assets/javascripts/sbdevcore.js" />
97
73
  <option value="$PROJECT_DIR$/app/assets/javascripts/sbdev-ajax.js" />
98
74
  <option value="$PROJECT_DIR$/app/assets/javascripts/sbdevcore-tools.js" />
75
+ <option value="$PROJECT_DIR$/app/views/galleries/_show.html.haml" />
76
+ <option value="$PROJECT_DIR$/lib/generators/sbdevcore/install_generator.rb" />
77
+ <option value="$PROJECT_DIR$/../../working/carol/app/views/application/_header.html.haml" />
78
+ <option value="$PROJECT_DIR$/app/assets/stylesheets/_bar_nav.scss" />
79
+ <option value="$PROJECT_DIR$/app/assets/stylesheets/_sbdev_core.scss" />
80
+ <option value="$PROJECT_DIR$/app/views/sbdev_core/index.html.haml" />
99
81
  <option value="$PROJECT_DIR$/lib/sbdevcore/version.rb" />
100
82
  </list>
101
83
  </option>
@@ -126,8 +108,9 @@
126
108
  <sortByType />
127
109
  </navigator>
128
110
  <panes>
129
- <pane id="RailsProjectView" />
130
111
  <pane id="Scope" />
112
+ <pane id="Favorites" />
113
+ <pane id="RailsProjectView" />
131
114
  <pane id="ProjectPane">
132
115
  <subPane>
133
116
  <PATH>
@@ -159,6 +142,10 @@
159
142
  <option name="myItemId" value="app" />
160
143
  <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
161
144
  </PATH_ELEMENT>
145
+ <PATH_ELEMENT>
146
+ <option name="myItemId" value="views" />
147
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
148
+ </PATH_ELEMENT>
162
149
  </PATH>
163
150
  <PATH>
164
151
  <PATH_ELEMENT>
@@ -174,7 +161,11 @@
174
161
  <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
175
162
  </PATH_ELEMENT>
176
163
  <PATH_ELEMENT>
177
- <option name="myItemId" value="assets" />
164
+ <option name="myItemId" value="views" />
165
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
166
+ </PATH_ELEMENT>
167
+ <PATH_ELEMENT>
168
+ <option name="myItemId" value="sbdev_core" />
178
169
  <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
179
170
  </PATH_ELEMENT>
180
171
  </PATH>
@@ -191,18 +182,9 @@
191
182
  <option name="myItemId" value="app" />
192
183
  <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
193
184
  </PATH_ELEMENT>
194
- <PATH_ELEMENT>
195
- <option name="myItemId" value="assets" />
196
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
197
- </PATH_ELEMENT>
198
- <PATH_ELEMENT>
199
- <option name="myItemId" value="javascripts" />
200
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
201
- </PATH_ELEMENT>
202
185
  </PATH>
203
186
  </subPane>
204
187
  </pane>
205
- <pane id="Favorites" />
206
188
  </panes>
207
189
  </component>
208
190
  <component name="PropertiesComponent">
@@ -436,7 +418,7 @@
436
418
  <editor active="true" />
437
419
  <layout>
438
420
  <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32908162" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
439
- <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32908162" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
421
+ <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32908162" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
440
422
  <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
441
423
  <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
442
424
  <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -466,7 +448,7 @@
466
448
  <option name="ENABLE_BACKGROUND_PROCESSES" value="true" />
467
449
  <option name="CHANGED_ON_SERVER_INTERVAL" value="5" />
468
450
  <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
469
- <option name="LAST_COMMIT_MESSAGE" value="slideshow" />
451
+ <option name="LAST_COMMIT_MESSAGE" value="simplify layout" />
470
452
  <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" />
471
453
  <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
472
454
  <option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
@@ -496,6 +478,7 @@
496
478
  <MESSAGE value="tweaks" />
497
479
  <MESSAGE value="photo from url" />
498
480
  <MESSAGE value="slideshow" />
481
+ <MESSAGE value="simplify layout" />
499
482
  </component>
500
483
  <component name="XDebuggerManager">
501
484
  <breakpoint-manager>
@@ -508,90 +491,86 @@
508
491
  </breakpoint-manager>
509
492
  </component>
510
493
  <component name="editorHistoryManager">
511
- <entry file="file://$PROJECT_DIR$/db/seeds.rb">
494
+ <entry file="file://$PROJECT_DIR$/lib/generators/sbdevcore/templates/application/_header.html.haml">
512
495
  <provider selected="true" editor-type-id="text-editor">
513
496
  <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
514
497
  </provider>
515
498
  </entry>
516
- <entry file="file://$PROJECT_DIR$/app/views/indices/_form.html.haml">
499
+ <entry file="file://$PROJECT_DIR$/../../working/carol/app/views/layouts/application.html.haml">
517
500
  <provider selected="true" editor-type-id="text-editor">
518
- <state line="5" column="0" selection-start="164" selection-end="164" vertical-scroll-proportion="0.016282225" />
501
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
519
502
  </provider>
520
503
  </entry>
521
- <entry file="file://$PROJECT_DIR$/app/views/photos/_form.html.haml">
504
+ <entry file="file://$PROJECT_DIR$/lib/generators/sbdevcore/install_generator.rb">
522
505
  <provider selected="true" editor-type-id="text-editor">
523
- <state line="10" column="0" selection-start="588" selection-end="588" vertical-scroll-proportion="0.016282225" />
506
+ <state line="39" column="47" selection-start="1282" selection-end="1282" vertical-scroll-proportion="0.39655173" />
524
507
  </provider>
525
508
  </entry>
526
- <entry file="file://$PROJECT_DIR$/app/models/index.rb">
509
+ <entry file="file://$PROJECT_DIR$/app/views/galleries/_show.html.haml">
527
510
  <provider selected="true" editor-type-id="text-editor">
528
- <state line="41" column="24" selection-start="1606" selection-end="1606" vertical-scroll-proportion="0.016620498" />
511
+ <state line="6" column="67" selection-start="332" selection-end="332" vertical-scroll-proportion="0.09972299" />
529
512
  </provider>
530
513
  </entry>
531
- <entry file="file://$PROJECT_DIR$/app/views/galleries/_form.html.haml">
514
+ <entry file="file://$PROJECT_DIR$/lib/generators/sbdevcore/templates/application/application.html.haml">
532
515
  <provider selected="true" editor-type-id="text-editor">
533
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
516
+ <state line="18" column="15" selection-start="621" selection-end="621" vertical-scroll-proportion="0.2857143" />
534
517
  </provider>
535
518
  </entry>
536
- <entry file="file://$PROJECT_DIR$/app/views/galleries/new.html.haml">
519
+ <entry file="file://$PROJECT_DIR$/lib/generators/sbdevcore/templates/layouts/application.html.haml">
537
520
  <provider selected="true" editor-type-id="text-editor">
538
- <state line="0" column="0" selection-start="0" selection-end="202" vertical-scroll-proportion="0.0" />
521
+ <state line="22" column="34" selection-start="720" selection-end="720" vertical-scroll-proportion="0.34920636" />
539
522
  </provider>
540
523
  </entry>
541
- <entry file="file://$PROJECT_DIR$/app/views/indices/_show.html.haml">
524
+ <entry file="file://$PROJECT_DIR$/app/models/downloadable.rb">
542
525
  <provider selected="true" editor-type-id="text-editor">
543
- <state line="22" column="22" selection-start="1224" selection-end="1224" vertical-scroll-proportion="0.016194332" />
526
+ <state line="13" column="28" selection-start="455" selection-end="455" vertical-scroll-proportion="0.20634921" />
544
527
  </provider>
545
528
  </entry>
546
- <entry file="file://$PROJECT_DIR$/app/views/galleries/_show.html.haml">
529
+ <entry file="file://$PROJECT_DIR$/app/models/photo.rb">
547
530
  <provider selected="true" editor-type-id="text-editor">
548
- <state line="1" column="0" selection-start="38" selection-end="38" vertical-scroll-proportion="0.016194332" />
531
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
549
532
  </provider>
550
533
  </entry>
551
- <entry file="file://$PROJECT_DIR$/app/assets/javascripts/tiny_mce_config.js">
534
+ <entry file="file://$PROJECT_DIR$/app/models/text.rb">
552
535
  <provider selected="true" editor-type-id="text-editor">
553
- <state line="19" column="41" selection-start="501" selection-end="501" vertical-scroll-proportion="0.30769232" />
536
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
554
537
  </provider>
555
538
  </entry>
556
- <entry file="file://$PROJECT_DIR$/app/assets/javascripts/history.html4.js">
539
+ <entry file="file://$PROJECT_DIR$/lib/generators/sbdevcore/templates/application.scss">
557
540
  <provider selected="true" editor-type-id="text-editor">
558
541
  <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
559
542
  </provider>
560
543
  </entry>
561
- <entry file="file://$PROJECT_DIR$/app/assets/javascripts/history.adapter.jquery.js">
544
+ <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/_sbdev_core.scss">
562
545
  <provider selected="true" editor-type-id="text-editor">
563
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
546
+ <state line="36" column="13" selection-start="690" selection-end="690" vertical-scroll-proportion="0.20899472" />
564
547
  </provider>
565
548
  </entry>
566
- <entry file="file://$PROJECT_DIR$/app/assets/javascripts/sbdevcore-tools.js">
549
+ <entry file="file://$PROJECT_DIR$/lib/generators/sbdevcore/templates/sass.scss">
567
550
  <provider selected="true" editor-type-id="text-editor">
568
- <state line="128" column="6" selection-start="3626" selection-end="3626" vertical-scroll-proportion="0.0">
569
- <folding />
570
- </state>
551
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
571
552
  </provider>
572
553
  </entry>
573
- <entry file="file://$PROJECT_DIR$/app/assets/javascripts/sbdevcore.js">
554
+ <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/_bar_nav.scss">
574
555
  <provider selected="true" editor-type-id="text-editor">
575
- <state line="14" column="26" selection-start="669" selection-end="669" vertical-scroll-proportion="0.0">
576
- <folding />
577
- </state>
556
+ <state line="3" column="9" selection-start="71" selection-end="71" vertical-scroll-proportion="0.04761905" />
578
557
  </provider>
579
558
  </entry>
580
- <entry file="file://$PROJECT_DIR$/app/assets/javascripts/sbdev-ajax.js">
559
+ <entry file="file://$PROJECT_DIR$/app/views/sbdev_core/show.html.haml">
581
560
  <provider selected="true" editor-type-id="text-editor">
582
- <state line="32" column="49" selection-start="1055" selection-end="1055" vertical-scroll-proportion="0.0">
583
- <folding />
584
- </state>
561
+ <state line="1" column="92" selection-start="127" selection-end="171" vertical-scroll-proportion="0.0" />
585
562
  </provider>
586
563
  </entry>
587
- <entry file="file://$PROJECT_DIR$/lib/sbdevcore.rb">
564
+ <entry file="file://$PROJECT_DIR$/app/views/sbdev_core/index.html.haml">
588
565
  <provider selected="true" editor-type-id="text-editor">
589
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
566
+ <state line="9" column="0" selection-start="345" selection-end="345" vertical-scroll-proportion="0.0">
567
+ <folding />
568
+ </state>
590
569
  </provider>
591
570
  </entry>
592
571
  <entry file="file://$PROJECT_DIR$/lib/sbdevcore/version.rb">
593
572
  <provider selected="true" editor-type-id="text-editor">
594
- <state line="1" column="18" selection-start="35" selection-end="35" vertical-scroll-proportion="0.015873017">
573
+ <state line="1" column="18" selection-start="35" selection-end="35" vertical-scroll-proportion="0.024439918">
595
574
  <folding />
596
575
  </state>
597
576
  </provider>
data/app/assets/stylesheets/_bar_nav.scss CHANGED
@@ -15,19 +15,12 @@
15
15
 
16
16
  #main_container {
17
17
  @include box-shadow($shadow-radius);
18
- @include corners-all($corner-radius);
18
+ @include corners-bottom($corner-radius);
19
19
  background-color: $content-background-color;
20
- border: 2px solid silver;
21
20
  margin-top: 0px;
22
- position: relative;
23
- top: -45px;
24
21
  .content {
25
22
  @include box-shadow(0);
26
23
  @include corners-all(0);
27
24
  background-color: transparent;
28
25
  }
29
- #nav {
30
- @include corners-top($corner-radius - 2px);
31
- @include box-shadow(0);
32
- }
33
26
  }
data/app/assets/stylesheets/_sbdev_core.scss CHANGED
@@ -26,23 +26,15 @@ body {
26
26
  }
27
27
 
28
28
  #header {
29
- background-color: $content-background-color;
30
- height: 120px;
31
- border-bottom: 2px solid silver;
32
- .inner {
33
- width: $content-width;
34
- margin: 0 auto;
35
- position: relative;
36
- h1 {
37
- margin: 10px 0;
38
- font-size: 300%;
39
- letter-spacing: 3px;
40
- word-spacing: 7px;
41
- font-family: "28Days";
42
- text-shadow: 4px 4px 3px steelblue;
43
- display: inline-block;
44
- font-weight: normal;
45
- }
29
+ h1 {
30
+ font-size: 300%;
31
+ letter-spacing: 3px;
32
+ word-spacing: 7px;
33
+ font-family: "28Days";
34
+ text-shadow: 4px 4px 3px steelblue;
35
+ font-weight: normal;
36
+ text-align: center;
37
+ margin: 0;
46
38
  }
47
39
  }
48
40
 
@@ -79,14 +71,9 @@ body {
79
71
  }
80
72
 
81
73
  .title {
82
- width: 67%;
83
- background-color: $button-background-color;
84
- padding: 10px;
85
74
  margin: 0;
86
- color: $content-background-color;
87
- position: relative;
88
- left: -15px;
89
- @include corners-right($corner-radius);
75
+ color: $button-background-color;
76
+ font-weight: bold;
90
77
  }
91
78
 
92
79
  .content {
data/app/views/galleries/_show.html.haml CHANGED
@@ -4,6 +4,7 @@
4
4
  %a{:class => "#{'no_back ' unless (indices.size > 1)}backward browse left"}
5
5
  %a{:class => "#{'no_back ' unless (indices.size > 1)}forward browse right"}
6
6
  #gallery_wrap_inner
7
+ =(render :partial => 'indices/show', :object => indices.first, :as => :index)
7
8
  .scroll_nav.clearfix
8
9
  %a{:class => "#{'no_back ' unless (indices.size > 4)}prev browse left"}
9
10
  .scrollable.corner-all.nav
data/app/views/sbdev_core/index.html.haml CHANGED
@@ -2,6 +2,7 @@
2
2
  =render :partial => "application/secondary_nav"
3
3
 
4
4
  =(render :partial => 'indices/show', :object => @index, :as => :index)
5
+ =(render :partial => 'show', :collection => collection, :as => resource_class.to_s.downcase.to_sym)
5
6
  - if request.xhr?
6
7
  .content_for.hidden
7
8
  #content_for_sidebar
data/lib/generators/sbdevcore/install_generator.rb CHANGED
@@ -37,6 +37,7 @@ module Sbdevcore
37
37
  copy_file "application.scss", "app/assets/stylesheets/application.scss", :force => true
38
38
  copy_file "sass.scss", "app/assets/stylesheets/sass.scss", :force => true
39
39
  directory "application", "app/views/application"
40
+ directory "layouts", "app/views/layouts"
40
41
  inject_into_file "app/assets/javascripts/application.js", "//= require sbdevcore\n", :before => "//= require_tree ."
41
42
 
42
43
  dev_mailer = <<-OPTS
data/lib/generators/sbdevcore/templates/application/_header.html.haml ADDED
@@ -0,0 +1 @@
1
+ %h1=APP_CONFIG[:app_name]
data/lib/generators/sbdevcore/templates/layouts/application.html.haml ADDED
@@ -0,0 +1,26 @@
1
+ %html(xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en")
2
+ %head
3
+ %title=yield(:title)
4
+ %meta{:name => 'description', :content => yield(:description)}
5
+ %meta{:name => 'keywords', :content => yield(:keywords)}
6
+ = stylesheet_link_tag 'application'
7
+ = javascript_include_tag 'application'
8
+ = csrf_meta_tag
9
+ = yield(:head)
10
+ %body
11
+ #container
12
+ #main_container
13
+ #header
14
+ =render 'application/header'
15
+ = render 'application/nav'
16
+ - flash.each do |name, msg|
17
+ = content_tag :div, msg, :id => "flash_#{name}"
18
+ .content.clearfix
19
+ #sidebar
20
+ = yield(:sidebar)
21
+ #main
22
+ = yield
23
+ = yield(:gallery)
24
+ = render 'application/footer'
25
+ #overlay.overlay
26
+ .contentWrap
data/lib/sbdevcore/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module Sbdevcore
2
- VERSION = "0.3.2"
2
+ VERSION = "0.3.3"
3
3
  end
4
4
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sbdevcore
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.2
4
+ version: 0.3.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2011-11-02 00:00:00.000000000Z
12
+ date: 2011-11-08 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: tinymce-rails
16
- requirement: &2161077880 !ruby/object:Gem::Requirement
16
+ requirement: &2154108440 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *2161077880
24
+ version_requirements: *2154108440
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: prioritizable
27
- requirement: &2161077380 !ruby/object:Gem::Requirement
27
+ requirement: &2154107940 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 0.0.5
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *2161077380
35
+ version_requirements: *2154107940
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: devise
38
- requirement: &2161094100 !ruby/object:Gem::Requirement
38
+ requirement: &2154107520 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *2161094100
46
+ version_requirements: *2154107520
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: paperclip
49
- requirement: &2161093640 !ruby/object:Gem::Requirement
49
+ requirement: &2154107060 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *2161093640
57
+ version_requirements: *2154107060
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: haml-edge
60
- requirement: &2161093220 !ruby/object:Gem::Requirement
60
+ requirement: &2154106640 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *2161093220
68
+ version_requirements: *2154106640
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: sitemap_generator
71
- requirement: &2161092800 !ruby/object:Gem::Requirement
71
+ requirement: &2154106220 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *2161092800
79
+ version_requirements: *2154106220
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: hpricot
82
- requirement: &2161092380 !ruby/object:Gem::Requirement
82
+ requirement: &2154122940 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :runtime
89
89
  prerelease: false
90
- version_requirements: *2161092380
90
+ version_requirements: *2154122940
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: simple_form
93
- requirement: &2161091960 !ruby/object:Gem::Requirement
93
+ requirement: &2154122520 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '0'
99
99
  type: :runtime
100
100
  prerelease: false
101
- version_requirements: *2161091960
101
+ version_requirements: *2154122520
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: client_side_validations
104
- requirement: &2161091540 !ruby/object:Gem::Requirement
104
+ requirement: &2154122100 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '0'
110
110
  type: :runtime
111
111
  prerelease: false
112
- version_requirements: *2161091540
112
+ version_requirements: *2154122100
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: formalize-rails
115
- requirement: &2161091120 !ruby/object:Gem::Requirement
115
+ requirement: &2154121680 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: '0'
121
121
  type: :runtime
122
122
  prerelease: false
123
- version_requirements: *2161091120
123
+ version_requirements: *2154121680
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: will_paginate
126
- requirement: &2161090620 !ruby/object:Gem::Requirement
126
+ requirement: &2154121180 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ~>
@@ -131,10 +131,10 @@ dependencies:
131
131
  version: 3.0.pre4
132
132
  type: :runtime
133
133
  prerelease: false
134
- version_requirements: *2161090620
134
+ version_requirements: *2154121180
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: aws-s3
137
- requirement: &2161090200 !ruby/object:Gem::Requirement
137
+ requirement: &2154120760 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
142
142
  version: '0'
143
143
  type: :runtime
144
144
  prerelease: false
145
- version_requirements: *2161090200
145
+ version_requirements: *2154120760
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: inherited_resources
148
- requirement: &2161089740 !ruby/object:Gem::Requirement
148
+ requirement: &2154120300 !ruby/object:Gem::Requirement
149
149
  none: false
150
150
  requirements:
151
151
  - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
153
153
  version: '0'
154
154
  type: :runtime
155
155
  prerelease: false
156
- version_requirements: *2161089740
156
+ version_requirements: *2154120300
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: friendly_id
159
- requirement: &2161089240 !ruby/object:Gem::Requirement
159
+ requirement: &2154119800 !ruby/object:Gem::Requirement
160
160
  none: false
161
161
  requirements:
162
162
  - - ~>
@@ -164,7 +164,7 @@ dependencies:
164
164
  version: 4.0.0.beta8
165
165
  type: :runtime
166
166
  prerelease: false
167
- version_requirements: *2161089240
167
+ version_requirements: *2154119800
168
168
  description: Core
169
169
  email:
170
170
  - aosalias@gmail.com
@@ -270,8 +270,6 @@ files:
270
270
  - app/views/indices/edit.html.haml
271
271
  - app/views/indices/new.html.haml
272
272
  - app/views/indices/show.html.haml
273
- - app/views/layouts/application.html.haml
274
- - app/views/layouts/bar_nav.html.haml
275
273
  - app/views/layouts/sbdev_core.html.haml
276
274
  - app/views/layouts/tab_nav.html.haml
277
275
  - app/views/mailer/message.erb
@@ -324,15 +322,18 @@ files:
324
322
  - lib/generators/sbdevcore/templates/application.scss
325
323
  - lib/generators/sbdevcore/templates/application/_404.html.haml
326
324
  - lib/generators/sbdevcore/templates/application/_footer.html.haml
325
+ - lib/generators/sbdevcore/templates/application/_header.html.haml
327
326
  - lib/generators/sbdevcore/templates/application/_inline_nav.html.haml
328
327
  - lib/generators/sbdevcore/templates/application/_nav.html.haml
329
328
  - lib/generators/sbdevcore/templates/application/_trip_advisor.html
329
+ - lib/generators/sbdevcore/templates/application/application.html.haml
330
330
  - lib/generators/sbdevcore/templates/config/app_config.yml
331
331
  - lib/generators/sbdevcore/templates/config/initializers/devise.rb
332
332
  - lib/generators/sbdevcore/templates/config/initializers/load_app_config.rb
333
333
  - lib/generators/sbdevcore/templates/config/initializers/mailer_setup.rb
334
334
  - lib/generators/sbdevcore/templates/config/s3.yml
335
335
  - lib/generators/sbdevcore/templates/database.yml
336
+ - lib/generators/sbdevcore/templates/layouts/application.html.haml
336
337
  - lib/generators/sbdevcore/templates/new_contact.html.haml
337
338
  - lib/generators/sbdevcore/templates/sass.scss
338
339
  - lib/sbdevcore.rb
data/app/views/layouts/bar_nav.html.haml DELETED
@@ -1,8 +0,0 @@
1
- #main_container
2
- = render 'application/nav'
3
- .content.clearfix
4
- - flash.each do |name, msg|
5
- = content_tag :div, msg, :id => "flash_#{name}"
6
- = yield
7
- = render 'application/footer'
8
-