RubyGems - gluttonberg-core - Versions diffs - 2.5 → 2.5.1 - Mend

gluttonberg-core 2.5 → 2.5.1

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.

Files changed (26) hide show

data/app/assets/stylesheets/admin-override.sass +116 -109
data/app/helpers/gluttonberg/asset_library.rb +3 -3
data/app/models/gluttonberg/asset.rb +9 -1
data/app/models/gluttonberg/member.rb +6 -1
data/app/views/gluttonberg/admin/asset_library/assets/_form.html.haml +18 -5
data/app/views/gluttonberg/admin/content/articles/_form.html.haml +29 -16
data/app/views/gluttonberg/admin/content/articles/edit.html.haml +1 -7
data/app/views/gluttonberg/admin/content/articles/index.html.haml +8 -1
data/app/views/gluttonberg/admin/content/page_localizations/_form.html.haml +17 -9
data/app/views/gluttonberg/admin/content/page_localizations/edit.html.haml +1 -1
data/app/views/gluttonberg/admin/content/pages/_row.html.haml +9 -7
data/app/views/layouts/gluttonberg.html.haml +4 -4
data/db/migrate/20121106025800_add_artist_and_link_to_assets.rb +6 -0
data/lib/engine.rb +3 -1
data/lib/gluttonberg/components.rb +18 -17
data/lib/gluttonberg/content/localization.rb +4 -7
data/lib/gluttonberg/library/attachment_mixin.rb +4 -4
data/lib/gluttonberg/version.rb +1 -1
metadata +5 -11
data/db/migrate/migrations +0 -1
data/db/migrate/old_migrations/1_untitled.rb +0 -147
data/db/migrate/old_migrations/20101110051141_version_tables.rb +0 -12
data/db/migrate/old_migrations/20101110061505_add_state_column.rb +0 -9
data/db/migrate/old_migrations/20101111002552_create_users.rb +0 -18
data/db/migrate/old_migrations/2_asset_library.rb +0 -87
data/lib/version.rb +0 -3

data/app/assets/stylesheets/admin-override.sass CHANGED Viewed

@@ -1,10 +1,10 @@
 //
   gb_skin
-.container-fluid .row-fluid
+.container-fluid .row-fluid
   min-size: 960px !important
-a.brand-img
+a.brand-img
   background: url(/assets/gb_logo_top.png) no-repeat 15px 6px
   text-indent: -9999px
   float: left
@@ -17,8 +17,8 @@ a.brand-img
   margin-left: -20px
   width: 115px
   padding: 0
-.navbar .brand
+.navbar .brand
   float: left
   display: block
   margin-left: 10px
@@ -27,16 +27,16 @@ a.brand-img
   line-height: 40px
   color: #fff
   padding: 0
 body
   :padding
     :top 160px !important
   background: url(/assets/bg.png) repeat
-.navbar-fixed-top
+.navbar-fixed-top
   z-index: 1035
 .navbar-inner
   background-color: #333
   background-image: -moz-linear-gradient(top, #555, #333)
@@ -54,7 +54,7 @@ body
   float: left
   margin: 5px 0 0 0
   border-radius: 2px
 .navbar-main
   top: 40px
   position: fixed
@@ -70,12 +70,12 @@ body
     margin: 0px
     padding: 0px
     height: 80px
     li
       float: left
       width: 130px
       height: 80px
       a
         display:block
         color: #fff
@@ -86,120 +86,120 @@ body
         line-height: 1em
         background-position: 50% 100%
         background-repeat: no-repeat
       a:hover, a.active
         background-color: #d35152
         background-position: 50% 0
         background-repeat: no-repeat
       a#dashboard_nav
         background-image: url('/assets/icon_dashboard.png')
       a#content_nav
         background-image: url('/assets/icon_content.png')
       a#library_nav
         background-image: url('/assets/icon_library.png')
       a#membership_nav
         background-image: url('/assets/icon_members.png')
       a#settings_nav
         background-image: url('/assets/icon_settings.png')
 .dash-left
   background: #fff
   height: 100%
   margin: 0
 .page-header
   margin: 0 0 18px 0
-.well.sidebar-nav
+.well.sidebar-nav
   background: white
   border: 1px solid #DDD
   box-shadow: none
-.nav-list > .active > a, .nav-list > .active > a:hover
+.nav-list > .active > a, .nav-list > .active > a:hover
   color: white
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2)
   background-color: #83A2B2
   padding: 3px 10px 3px 35px
   background-position: 15px -32px  !important
 .nav-list > li > a
   padding: 3px 10px 3px 35px
-  background-image: url(/assets/icon_default.png)
-  background-position: 15px 5px
+  background-image: url(/assets/icon_default.png)
+  background-position: 15px 5px
   background-repeat: no-repeat
 .nav-list a.blog
-  background-image: url(/assets/icon_blog.png)
-  background-position: 15px 5px
+  background-image: url(/assets/icon_blog.png)
+  background-position: 15px 5px
   background-repeat: no-repeat
 .nav-list a.pages
-  background-image: url(/assets/icon_pages.png)
-  background-position: 15px 5px
+  background-image: url(/assets/icon_pages.png)
+  background-position: 15px 5px
   background-repeat: no-repeat
 .nav-list a#groupsNav
-  background-image: url(/assets/icon_member.png)
-  background-position: 15px 5px
+  background-image: url(/assets/icon_member.png)
+  background-position: 15px 5px
   background-repeat: no-repeat
 .nav-list a#membersNav
-  background-image: url(/assets/icon_member.png)
-  background-position: 15px 5px
+  background-image: url(/assets/icon_member.png)
+  background-position: 15px 5px
   background-repeat: no-repeat
 .nav-list a.upload
-  background-image: url(/assets/icon_upload.png)
-  background-position: 15px 5px
+  background-image: url(/assets/icon_upload.png)
+  background-position: 15px 5px
   background-repeat: no-repeat
 .nav-list a.collections
-  background-image: url(/assets/icon_collection.png)
-  background-position: 15px 5px
+  background-image: url(/assets/icon_collection.png)
+  background-position: 15px 5px
   background-repeat: no-repeat
 .nav-list a.assets
-  background-image: url(/assets/icon_asset.png)
-  background-position: 15px 5px
+  background-image: url(/assets/icon_asset.png)
+  background-position: 15px 5px
   background-repeat: no-repeat
 .nav-list a.active
-  background-position: 15px -32px
+  background-position: 15px -32px
   background-repeat:no-repeat
 .dashboard.well
   background-color: #fff
-.dashboard .nav-list
+.dashboard .nav-list
   margin: 0
   padding: 0
 .dashboard a
   display: block
   margin: 0 0 3px 0
 .dashboard a.edit
-  background-image: url(/assets/icon_blog.png)
+  background-image: url(/assets/icon_blog.png)
 .dashboard a.add
-  background-image: url(/assets/icon_add.png)
+  background-image: url(/assets/icon_add.png)
 a
   color: #83A2B2
 a:hover
   color: #728d9b
-h1
+h1
   color: #333
 h1 a
@@ -207,13 +207,13 @@ h1 a
 h1 a:hover
   text-decoration: none
 input, textarea
   display: block
 label
   display: inline-block
 input[type="radio"], input[type="checkbox"]
   display: inline-block
   float: left
@@ -221,10 +221,10 @@ input[type="radio"], input[type="checkbox"]
 select
   display: block
 legend
-  margin-bottom: 15px
+  margin-bottom: 15px
 input:focus, textarea:focus, select:focus
   border-color: rgba(0, 0, 0, 0.3)
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(0, 0, 0, 0.2)
@@ -232,7 +232,7 @@ input:focus, textarea:focus, select:focus
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(0, 0, 0, 0.2)
   outline: 0
-.btn-success, .btn-primary
+.btn-success, .btn-primary
   background-color: #96bacc
   background-image: -moz-linear-gradient(top, #83a2b2, #627985)
   background-image: -ms-linear-gradient(top, #83a2b2, #627985)
@@ -242,7 +242,7 @@ input:focus, textarea:focus, select:focus
   background-image: linear-gradient(top, #83a2b2, #627985)
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#83a2b2', endColorstr='#627985', GradientType=0)
   border-color: #83a2b2 #83a2b2 #556a74
 .btn-success:hover, .btn-success:active, .btn-primary:hover, .btn-primary:active,  .btn-success.active, .btn-success.disabled, .btn-success[disabled]
   background-color: #627985
@@ -258,17 +258,17 @@ input:focus, textarea:focus, select:focus
 .comment hr
   margin: 5px 0
 .comment .controls
   text-align: right
 span.date
   color: #999
 #asset_search_form, #list_search_form
   input
     display: inline-block
-  input.button
+  input.button
     background: #83A2B2
     color: white
     border: none
@@ -279,7 +279,7 @@ span.date
 .table-bordered
   background: #fff
 .meta_body
   dl
     :width 100%
@@ -294,38 +294,38 @@ span.date
   dt:first-child, dd:nth-child(2)
     :border-top none
     :padding-top 0
 #login
   img
     :float left
     :margin -5px 10px 0 0
   #form.well
     :margin 10px 0
     .alert
       .error-title
         :font
           :size 14px
         :margin
           :bottom 10px
     form
       :margin 0
       input.span4
         :width 420px
 form
   .span5
     :margin 0 !important
     :width 520px
     input[type="text"]
       :width 510px
     textarea
       :width 510px
       :height 200px
@@ -333,11 +333,11 @@ td
   a.thumbnail
     :background #ffffff
     :width 160px
 ul.thumbnails
-  p
+  p
     :margin 9px 0 0 !important
 .modal
   :position fixed !important
   :top 50%
@@ -351,8 +351,8 @@ ul.thumbnails
   :margin
     :top -100px
     :left -100px
 .ui-draggable
   background: url('/assets/drag_handle.png') no-repeat
   width: 11px
@@ -381,7 +381,7 @@ ul.thumbnails
 .ui-resizable .ui-resizable-handle
   display: block
 tr
   &.insert_after td
     border: none
@@ -403,13 +403,13 @@ tr
     z-index: 1
-.help-block
+.help-block
   .span2
     :margin-left 0px
     :color #BFBFBF
     :margin-top -5px
     :font-size 12px
 label.error
   :color #b94a48
@@ -419,17 +419,17 @@ form .span5
 .clear
   :clear both
 .model-error
-  :width 469px
+  :width 469px
 legend.expandable
   background: url('/assets/arrow.png') top right no-repeat
   cursor: pointer
-legend.collapsed
+legend.collapsed
   background: url('/assets/arrow.png') bottom right no-repeat
 //
@@ -476,7 +476,7 @@ legend.collapsed
         color: white
         text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2)
         background-color: #08C
 .pagination
   span.disabled, em
     float: left
@@ -490,7 +490,7 @@ legend.collapsed
     -webkit-border-radius: 3px 0 0 3px
     -moz-border-radius: 3px 0 0 3px
     border-radius: 3px 0 0 3px
 table
   thead
@@ -503,7 +503,7 @@ table
         &:hover, &.asc:hover, &.current.desc
           :padding-right 25px
           background: url("/assets/library/sort_by_desc.png") right no-repeat
 #page_slug_holder
   .domain
     :float left
@@ -511,14 +511,14 @@ table
   #page_slug
     span
       :background none
     #page_hidden_slug
       :display none
 .nav-tabs
   margin: 0
-.tab-content
+.tab-content
   display: table
   width: 100%
   border: 1px solid #DDD
@@ -527,12 +527,12 @@ table
 .tab-content .pad
   padding: 15px 10px
 .span5 .pad input[type="text"], .span5 .pad textarea
   width: 480px
 .nav-tabs > li > a
   font-size: 19.5px
   color: #333
@@ -543,21 +543,28 @@ table
 .versions
   position: absolute
   right: 0
 .table-bordered th
   border-left: none
   background: #eee
 .table-bordered th:first-child
   border-left: 1px solid #DDD
 .nav > li > a:hover
   background-color:  #f5f5f5
 .dropdown-menu li > a:hover
-  background-color: #83A2B2
+  background-color: #83A2B2
 .dropdown-menu li.danger > a:hover
-  background-color: #DA4F49
+  background-color: #DA4F49
+.versions.page_content_form
+  .btn-group
+    :float left
+    :margin-right 10px
+  .historycontrols
+    :float left