trusty-cms 2.0.2 → 2.0.3.pre.beta

data/app/assets/javascripts/admin/page-edit.js

@@ -11,7 +11,7 @@
         }
       )
     }
-  };
+  }
 
   PageEdit.partAdded = function (tabId) {
     $('#add_part_busy').hide();
@@ -20,12 +20,12 @@
     $('#part_name_field').val('');
     TabControl.updateTabsBasedOnPages();
     TabControl.selectTab($('div#tab_control .tabs .tab').last().attr('id'));
-  };
+  }
 
   PageEdit.partLoading = function () {
     $('#add_part_button').attr('disabled', true);
     $('#add_part_busy').show();
-  };
+  }
 
   PageEdit.validPartName = function () {
     var partNameField = $('#part_name_field');

data/app/assets/javascripts/admin/tabcontrol.js.erb

@@ -15,32 +15,32 @@
         TabControl.removeTab($(this).closest('.tab').attr('id'));
       });
 
-      TabControl.selectTab($pages.first().attr('id').replace(/-/, "_"));
+      TabControl.selectTab($pages.first().attr('id'));
     }
   }
 
-    TabControl.selectTab = function(id) {
-        id = id.replace(/^tab_/, '').replace(/^page_/, '');
-        var underscored_id = id.replace(/_/g, "-").toLowerCase();
-        var $pages = $('div#tab_control .pages .page');
-        var $tabs  = $('div#tab_control .tabs .tab');
-
-        $pages.hide();
-        $tabs.removeClass('here');
-
-        $pages.filter('#page_' + underscored_id).show();
-        $tabs.filter('#tab_' + id).addClass('here');
-    }
-
   TabControl.addTab = function(tabText) {
     $('div#tab_control .tabs').append("<a id='tab_" + tabText + "' href='#' class='tab'><span>" + tabText + "</span><img src='" + relative_url_root + "<%= asset_path('admin/tab_close.png') %>' class='close' alt='Remove part' title='Remove part' /></a>");
     var $page_part_index = $('#page_part_index_field');
     $page_part_index.val(parseInt($page_part_index.val()) + 1);
   }
 
+  TabControl.selectTab = function(id) {
+    id = id.replace(/^tab_/, '').replace(/^page_/, '');
+    var underscored_id = id.replace("_", "-");
+    var $pages = $('div#tab_control .pages .page');
+    var $tabs  = $('div#tab_control .tabs .tab');
+
+    $pages.hide();
+    $tabs.removeClass('here');
+
+    $pages.filter('#page_' + underscored_id).show();
+    $tabs.filter('#tab_' + id).addClass('here');
+  }
+
   TabControl.removeTab = function(id) {
-    id = id.replace(/^tab_/, '').replace(/^page_/, '').toLowerCase();
-    var underscored_id = id.replace("_", "-").toLowerCase();
+    id = id.replace(/^tab_/, '').replace(/^page_/, '');
+    var underscored_id = id.replace("_", "-");
     if(confirm('Remove the "' + id + '" part?')) {
       var $pages = $('div#tab_control .pages .page');
       var $tabs  = $('div#tab_control .tabs .tab');

data/app/assets/javascripts/admin/treetable.js

@@ -25,16 +25,15 @@ $(function() {
     },
     onNodeExpand: function() {
       var node = this;
-      var spinner = $($(node.row[0]).find(".busy")[0]);
-      spinner.show();
       persistStore.set(node.id, 'expanded');
       // Render loader/spinner while loading
       $.ajax({
-        async: true, // Must be false, otherwise loadBranch happens after showChildren?
+        async: false, // Must be false, otherwise loadBranch happens after showChildren?
         url: "/admin/pages/" + node.row.data('ttPageId') + "/children?index=" + node.id
       }).done(function(html) {
         var rows = $(html).filter("tr");
 
+
         $("#pages").treetable("loadBranch", node, rows);
         $.each(node.children, function() {
           var state = persistStore.get(this.id);
@@ -45,7 +44,6 @@ $(function() {
         $('a.dropdown').each(function(){
           Dropdown.setup(this);
         });
-        spinner.hide();
       });
     }
   });

data/app/assets/stylesheets/admin/_base.scss

@@ -1,14 +1,14 @@
 // Fonts
-$base-font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
+$base-font-family: "Lucida Grande", "Bitstream Vera Sans", Helvetica, Verdana, Arial, sans-serif;
 $base-font-size: 15px;
 
 // Links
-$base-link-color:#94BDC3 ;
+$base-link-color: #0066cc;
 $alt-link-color: red;
 
 // Header
-$header: #000 !default;
-$primary-tab: rgba(236, 6, 115, 0.6);
+$header: #ca0000 !default;
+$primary-tab: rgba(white, 0.3);
 $primary-tab-current: white;
 
 // Modules

data/app/assets/stylesheets/admin/modules/_links.scss

@@ -8,7 +8,7 @@
 
 @mixin alt-link {
   color: $alt-link-color;
-  text-decoration: none;
+  text-decoration: underline;
   &:hover {
     text-decoration: none;
   }

data/app/assets/stylesheets/admin/partials/_content.scss

@@ -25,16 +25,9 @@ table.fieldset {
 }
 
 body.reversed {
-  fieldset h1 {
-    font-size: 1.5em;
-  }
-  #content > h1:first-of-type {
-    font-size: 2em;
-  }
   h1 {
-    color: #94BDC3;
-    border-bottom: 1px solid #94BDC3;
-    background: #fff;
+    border-bottom: 1px solid #ababab;
+    background: #7e7e7e;
     font-size: 125%;
     margin: -20px -20px 20px;
     padding: 15px 20px;

data/app/assets/stylesheets/admin/partials/_forms.scss

@@ -16,14 +16,12 @@
     p {
       label {
         display: block;
-        &.checkbox,
-        &.radio {
+        &.checkbox, &.radio {
           display: inline;
           font-weight: normal;
           font-size: 95%;
           text-shadow: none;
           margin-right: 1em;
-          text-align: left;
         }
         &.multi_option {
           margin-bottom: 0.3em;
@@ -34,8 +32,7 @@
         font-size: 140%;
         margin-bottom: 0;
       }
-      input.checkbox,
-      input.radio {
+      input.checkbox, input.radio {
         margin-top: 0.3em;
       }
       textarea {
@@ -54,6 +51,7 @@
         text-shadow: 0px 0px 20px rgba(255, 255, 255, 0.1);
       }
       a {
+        color: white;
         &.action {
           background-color: #7e7e7e;
           font-size: 75%;
@@ -85,6 +83,17 @@
         margin: 0 1em 0 0;
       }
     }
+    .buttons {
+      color: #666666;
+      font-size: 80%;
+      margin: 2.5em 0 1em;
+      button, input.button {
+        font-size: 150%;
+      }
+      a {
+        @include alt-link;
+      }
+    }
   }
 }
 
@@ -94,7 +103,7 @@
 }
 
 .drawer_contents {
-  background: #c9c9c9;
+  background: #7e7e7e;
   @include border-bottom-right-radius(6px);
   margin: 0;
   margin-right: 2px;
@@ -112,8 +121,7 @@
     margin: 0;
     padding: 0;
     width: 100%;
-    th,
-    td {
+    th, td {
       border-top: 1px #999999 solid;
       padding: 6px;
     }
@@ -145,8 +153,7 @@
       }
     }
     tr:first-child {
-      td,
-      th {
+      td, th {
         border-top: none;
       }
     }
@@ -168,9 +175,7 @@
     text-shadow: #666666 1px 1px 0;
     text-decoration: none;
     @include border-bottom-radius(6px);
-    &:hover,
-    &:active,
-    &:focus {
+    &:hover, &:active, &:focus {
       text-decoration: underline;
     }
     &.more {
@@ -184,7 +189,7 @@
 
 .box {
   color: #333333;
-  background: #ffffff;
+  background: #f5f1e2;
   font-size: 90%;
   padding: 1px 15px 10px;
   position: relative;
@@ -195,9 +200,7 @@
     position: relative;
   }
   &:before {
-    @include linear-gradient(color-stops(white,
-    #f5f1e2 50%,
-    #f5f1e2));
+    @include linear-gradient(color-stops(white, #f5f1e2 50%, #f5f1e2));
     @include border-top-radius(10px);
     content: "\0020";
     display: block;
@@ -279,8 +282,9 @@ body.reversed {
     form {
       p {
         label {
-          color: #B9B9B9;
+          color: whitesmoke;
           font-weight: normal;
+          text-shadow: 1px 1px 0 #888888;
           .hint {
             display: inline;
           }
@@ -294,14 +298,11 @@ body.reversed {
         @include alt-box;
       }
       fieldset {
-        background: #fff;
+        background: #858585;
         padding: 20px 15px;
         margin-bottom: 20px;
         overflow: hidden;
-        @include single-box-shadow(#ababab,
-        1px,
-        1px,
-        0);
+        @include single-box-shadow(#ababab, 1px, 1px, 0);
         @include border-radius(8px);
         h3 {
           font-weight: bold;
@@ -319,27 +320,10 @@ body.reversed {
       color: #eeeeee;
     }
     textarea {
-      border: 1px solid #EAEAEA;
-    }
-    input:not([type=submit]):focus,
-    textarea:focus {
-      border: 1px #EC65A5;
-      -webkit-box-shadow: 0 0 10px #EC65A5;
-      -moz-box-shadow: 0 0 10px #EC65A5;
-      box-shadow: 0 0 10px #EC65A5;
-      outline: 0;
-    }
-    input[type=checkbox] {
-      border-radius: 5px;
+      border: 1px solid white;
     }
     .box {
-      @include single-box-shadow(rgba(0,
-      0,
-      0,
-      0.15),
-      2px,
-      2px,
-      3px);
+      @include single-box-shadow(rgba(0, 0, 0, 0.15), 2px, 2px, 3px);
     }
   }
 }
@@ -348,9 +332,7 @@ body.single_form {
   #content {
     #single_form {
       background: #f5f1e2;
-      @include linear-gradient(color-stops(#fdfcf9,
-      #f5f1e2 25%,
-      #f5f1e2));
+      @include linear-gradient(color-stops(#fdfcf9, #f5f1e2 25%, #f5f1e2));
       border: 0.35em solid #efead3;
       padding: 0.5em 1.5em;
       padding-right: 22px;
@@ -363,8 +345,7 @@ body.single_form {
       }
       p {
         font-size: 90%;
-        &.intro,
-        &.error {
+        &.intro, &.error {
           font-size: 100%;
           line-height: 1.4;
         }
@@ -423,8 +404,7 @@ body.single_form {
   }
 }
 
-body.edit_user,
-body.edit_personal_preferences {
+body.edit_user, body.edit_personal_preferences {
   #avatar {
     left: 26em;
     position: absolute;
@@ -437,51 +417,3 @@ body.edit_personal_preferences {
     }
   }
 }
-
-.button,
-button,
-input[type=button],
-input[type=submit],
-input[type=file] {
-  .fa {
-    color: #f3f3f3;
-  }
-  -webkit-appearance: none;
-  font-size: 1.1em;
-  padding: .5em 3em;
-  margin: 0.5em;
-  color: #f3f3f3;
-  background-color: #94BDC3;
-  border: 0;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
-  text-decoration: none;
-  &:hover {
-    color: #94BDC3;
-    background-color: #f3f3f3;
-    -webkit-transition: all .2s;
-    -moz-transition: all .2s;
-    -ms-transition: all .2s;
-    -o-transition: all .2s;
-    transition: all .2s;
-  }
-  &:hover > .fa {
-    color: #94BDC3;
-    -webkit-transition: all .2s;
-    -moz-transition: all .2s;
-    -ms-transition: all .2s;
-    -o-transition: all .2s;
-    transition: all .2s;
-  }
-}
-
-.hover {
-  color: #94BDC3;
-  background-color: #f3f3f3;
-  -webkit-transition: all .2s;
-  -moz-transition: all .2s;
-  -ms-transition: all .2s;
-  -o-transition: all .2s;
-  transition: all .2s;
-}

data/app/assets/stylesheets/admin/partials/_header.scss

@@ -19,7 +19,7 @@
   color: mix($header, white, 15%);
   font-size: 80%;
   float: right;
-  padding: 12px 10px 0 5px;
+  padding: 15px 10px 0 5px;
   height: 16px;
   a {
     color: white;
@@ -104,7 +104,8 @@ ul#secondary_navigation {
   li {
     float: left;
     display: block;
-    border-right: 1px solid #d3d3d3;
+    background: image-url("admin/navigation_secondary_separator.gif") bottom right no-repeat;
+    padding-right: 2px;
     a {
       color: #555555;
       display: block;

data/app/assets/stylesheets/admin/partials/_index.scss

@@ -35,8 +35,7 @@ table.index {
     text-align: left;
     padding: 4px 9px;
     border-top: 1px solid #f0f0f0;
-    a.action,
-    span.action.disabled {
+    a.action, span.action.disabled {
       padding: 6px;
       margin: 0 25px 0 1px;
       img {
@@ -82,7 +81,7 @@ table.index {
         color: black;
         text-decoration: none;
         &:hover {
-          color: #EC0673;
+          color: #0066cc;
           text-decoration: underline;
         }
       }
@@ -96,8 +95,7 @@ table.index {
     &:first-child {
       border-top: 1px solid white;
     }
-    &.hover,
-    &:hover {
+    &.hover, &:hover {
       td {
         border-top: 1px solid #d5f0ff;
         border-bottom: 1px solid #c5dff5;
@@ -107,8 +105,7 @@ table.index {
     }
   }
   thead {
-    tr,
-    tr:first-child {
+    tr, tr:first-child {
       border-top: none;
     }
   }
@@ -140,7 +137,7 @@ table.index#pages {
         text-decoration: none;
       }
       &:hover .title {
-        color: #EC0673;
+        color: #0066cc;
         text-decoration: underline;
       }
     }
@@ -198,4 +195,4 @@ table.index#users {
       font-weight: normal;
     }
   }
-}
+}

data/app/assets/stylesheets/admin/partials/_layout.scss

@@ -1,5 +1,6 @@
 body.reversed {
-  background-color: #737272;
+  background-color: #9e9e9e;
+  color: white;
 }
 
 body.single_form {

data/app/assets/stylesheets/admin/partials/_popup.scss

@@ -54,11 +54,22 @@ div.popup {
   }
   .buttons {
     border-top: 1px solid #e5e5e5;
+    background: whitesmoke;
+    font-size: 85%;
+    margin: 1.5em -20px -10px;
+    padding: 10px;
     text-align: right;
     input.button {
       font-size: 120%;
     }
     button {
+      font-size: 110%;
+      padding: 4px 15px 5px;
+      background: whitesmoke;
+      border: 1px solid #959595;
+      @include border-radius(100px);
+      @include single-box-shadow(white, 0, 2px, 0, inset);
+      @include linear-gradient(color-stops(#dddddd 0%, #eeeeee 15%, white 100%));
       &.default {
         border: 1px solid #154ca6;
         @include single-box-shadow(#c7e0f6, 0, 2px, 1px, inset);

data/app/assets/stylesheets/admin/partials/_tabcontrol.scss

@@ -6,8 +6,8 @@
     width: 100%;
     margin-right: -4px;
     .tab {
-      background-color: #e4e4e4;
-      color: black;
+      background-color: #cac8c0;
+      color: #7f7f7f;
       display: inline-block;
       font-size: 90%;
       text-align: left;
@@ -18,11 +18,11 @@
       @include border-top-radius(6px);
       &.here {
         background-color: white;
-        color: #737272;
+        color: black;
         font-weight: bold;
       }
       span:hover {
-        color: #737272;
+        color: black;
       }
       .close {
         margin-top: -4px;

data/app/assets/stylesheets/admin/partials/_typography.scss

@@ -75,7 +75,3 @@ input.big {
 table {
   border-collapse: collapse;
 }
-
-.fa{
-  color: #94BDC3;
-}

data/app/controllers/admin/pages_controller.rb

@@ -47,7 +47,7 @@ class Admin::PagesController < Admin::ResourceController
 
     def model_class
       if Page.descendants.any? { |d| d.to_s == params[:page_class] }
-        verify_page_class(params[:page_class])
+        params[:page_class].constantize
       elsif params[:page_id]
         Page.find(params[:page_id]).children
       else
@@ -89,12 +89,4 @@ class Admin::PagesController < Admin::ResourceController
       @meta << {:field => "slug", :type => "text_field", :args => [{:class => 'textbox', :maxlength => 100}]}
       @meta << {:field => "breadcrumb", :type => "text_field", :args => [{:class => 'textbox', :maxlength => 160}]}
     end
-
-  def verify_page_class(page_class)
-    if page_class.constantize.ancestors.include?(Page)
-      page_class.constantize
-    else
-      raise "I'm not allowed to constantize #{page_class}!"
-    end
-  end
 end

data/app/controllers/admin/references_controller.rb

@@ -1,14 +1,7 @@
 class Admin::ReferencesController < ApplicationController
   def show
     respond_to do |format|
-      render_allowed_type(params[:type])
-      format.any { render :action => @type, :content_type => "text/html", :layout => false }
+      format.any { render :action => params[:type], :content_type => "text/html", :layout => false }
     end
   end
-
-  private
-
-  def render_allowed_type(type)
-    @type = type
-  end
 end

data/app/controllers/admin/users_controller.rb

@@ -24,7 +24,7 @@ class Admin::UsersController < Admin::ResourceController
   def ensure_deletable
     if current_user.id.to_s == params[:id].to_s
       announce_cannot_delete_self
-      redirect_to admin_users_path
+      redirect_to admin_users_url
     end
   end
 

data/app/controllers/admin/welcome_controller.rb

@@ -4,7 +4,7 @@ class Admin::WelcomeController < ApplicationController
   skip_before_filter :verify_authenticity_token
 
   def index
-    redirect_to admin_pages_path
+    redirect_to admin_pages_url
   end
 
   def login
@@ -18,7 +18,7 @@ class Admin::WelcomeController < ApplicationController
         current_user.remember_me
         set_session_cookie
       end
-      redirect_to(session[:return_to] || welcome_path)
+      redirect_to(session[:return_to] || welcome_url)
       session[:return_to] = nil
     end
   end
@@ -28,7 +28,7 @@ class Admin::WelcomeController < ApplicationController
     self.current_user.forget_me if self.current_user
     self.current_user = nil
     announce_logged_out
-    redirect_to login_path
+    redirect_to login_url
   end
 
   private