trusty-cms 2.0.2.pre.beta → 2.0.2

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'));
+      TabControl.selectTab($pages.first().attr('id').replace(/-/, "_"));
     }
   }
 
+    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_/, '');
-    var underscored_id = id.replace("_", "-");
+    id = id.replace(/^tab_/, '').replace(/^page_/, '').toLowerCase();
+    var underscored_id = id.replace("_", "-").toLowerCase();
     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,15 +25,16 @@ $(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: false, // Must be false, otherwise loadBranch happens after showChildren?
+        async: true, // 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);
@@ -44,6 +45,7 @@ $(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 Grande", "Bitstream Vera Sans", Helvetica, Verdana, Arial, sans-serif;
+$base-font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 $base-font-size: 15px;
 
 // Links
-$base-link-color: #0066cc;
+$base-link-color:#94BDC3 ;
 $alt-link-color: red;
 
 // Header
-$header: #ca0000 !default;
-$primary-tab: rgba(white, 0.3);
+$header: #000 !default;
+$primary-tab: rgba(236, 6, 115, 0.6);
 $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: underline;
+  text-decoration: none;
   &:hover {
     text-decoration: none;
   }

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

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

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

@@ -16,12 +16,14 @@
     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;
@@ -32,7 +34,8 @@
         font-size: 140%;
         margin-bottom: 0;
       }
-      input.checkbox, input.radio {
+      input.checkbox,
+      input.radio {
         margin-top: 0.3em;
       }
       textarea {
@@ -51,7 +54,6 @@
         text-shadow: 0px 0px 20px rgba(255, 255, 255, 0.1);
       }
       a {
-        color: white;
         &.action {
           background-color: #7e7e7e;
           font-size: 75%;
@@ -83,17 +85,6 @@
         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;
-      }
-    }
   }
 }
 
@@ -103,7 +94,7 @@
 }
 
 .drawer_contents {
-  background: #7e7e7e;
+  background: #c9c9c9;
   @include border-bottom-right-radius(6px);
   margin: 0;
   margin-right: 2px;
@@ -121,7 +112,8 @@
     margin: 0;
     padding: 0;
     width: 100%;
-    th, td {
+    th,
+    td {
       border-top: 1px #999999 solid;
       padding: 6px;
     }
@@ -153,7 +145,8 @@
       }
     }
     tr:first-child {
-      td, th {
+      td,
+      th {
         border-top: none;
       }
     }
@@ -175,7 +168,9 @@
     text-shadow: #666666 1px 1px 0;
     text-decoration: none;
     @include border-bottom-radius(6px);
-    &:hover, &:active, &:focus {
+    &:hover,
+    &:active,
+    &:focus {
       text-decoration: underline;
     }
     &.more {
@@ -189,7 +184,7 @@
 
 .box {
   color: #333333;
-  background: #f5f1e2;
+  background: #ffffff;
   font-size: 90%;
   padding: 1px 15px 10px;
   position: relative;
@@ -200,7 +195,9 @@
     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;
@@ -282,9 +279,8 @@ body.reversed {
     form {
       p {
         label {
-          color: whitesmoke;
+          color: #B9B9B9;
           font-weight: normal;
-          text-shadow: 1px 1px 0 #888888;
           .hint {
             display: inline;
           }
@@ -298,11 +294,14 @@ body.reversed {
         @include alt-box;
       }
       fieldset {
-        background: #858585;
+        background: #fff;
         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;
@@ -320,10 +319,27 @@ body.reversed {
       color: #eeeeee;
     }
     textarea {
-      border: 1px solid white;
+      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;
     }
     .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);
     }
   }
 }
@@ -332,7 +348,9 @@ 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;
@@ -345,7 +363,8 @@ body.single_form {
       }
       p {
         font-size: 90%;
-        &.intro, &.error {
+        &.intro,
+        &.error {
           font-size: 100%;
           line-height: 1.4;
         }
@@ -404,7 +423,8 @@ body.single_form {
   }
 }
 
-body.edit_user, body.edit_personal_preferences {
+body.edit_user,
+body.edit_personal_preferences {
   #avatar {
     left: 26em;
     position: absolute;
@@ -417,3 +437,51 @@ body.edit_user, 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: 15px 10px 0 5px;
+  padding: 12px 10px 0 5px;
   height: 16px;
   a {
     color: white;
@@ -104,8 +104,7 @@ ul#secondary_navigation {
   li {
     float: left;
     display: block;
-    background: image-url("admin/navigation_secondary_separator.gif") bottom right no-repeat;
-    padding-right: 2px;
+    border-right: 1px solid #d3d3d3;
     a {
       color: #555555;
       display: block;

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

@@ -35,7 +35,8 @@ 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 {
@@ -81,7 +82,7 @@ table.index {
         color: black;
         text-decoration: none;
         &:hover {
-          color: #0066cc;
+          color: #EC0673;
           text-decoration: underline;
         }
       }
@@ -95,7 +96,8 @@ table.index {
     &:first-child {
       border-top: 1px solid white;
     }
-    &.hover, &:hover {
+    &.hover,
+    &:hover {
       td {
         border-top: 1px solid #d5f0ff;
         border-bottom: 1px solid #c5dff5;
@@ -105,7 +107,8 @@ table.index {
     }
   }
   thead {
-    tr, tr:first-child {
+    tr,
+    tr:first-child {
       border-top: none;
     }
   }
@@ -137,7 +140,7 @@ table.index#pages {
         text-decoration: none;
       }
       &:hover .title {
-        color: #0066cc;
+        color: #EC0673;
         text-decoration: underline;
       }
     }
@@ -195,4 +198,4 @@ table.index#users {
       font-weight: normal;
     }
   }
-}
+}