trusty-cms 4.0.2 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df7407acd1c4fbec623b0db122f04a560cacaa2d6997fc8c16bc95a76994bbef
-  data.tar.gz: c8d47d1c903e107608fe0da4d94f2254c678cbb2ad5195cb836bf619c4fb29da
+  metadata.gz: 1cec5c72cf1d47c8753242f4bb6933ee6e11f2aa6dac456417d7cbc66b9b9f34
+  data.tar.gz: 891578d38ac65c2fc85e8525cf7e2f60ded3e9c68c33da8120783c7c093d785e
 SHA512:
-  metadata.gz: 479e73974a02270bb4d666bb19dce9b354757551dbf6a2846a7fffaad8a482124bb85d81c1997ef22ff35772ceb093c90bfa75ba1ffbee7d12ae058345de60cc
-  data.tar.gz: b1e40b2f698f9e414fc83c39e54ad3eeb9c18ca0f5902c430946169ec7b6e632e7c56944598e7451944e2df103e2fb36f122ca74f54ac4c3f84d3dd36f16987b
+  metadata.gz: 4dc36d74cdd75908dce51329e1addbaf2dc071cca18286b855212a16f61516967106345ee2114a68a173f6627496ee66b7b745547509a41a14ded504bfc178da
+  data.tar.gz: a2f248822127a1fa38166eda8f11e6e90b3da5d5344e9a9a4d6b66bc3313bdb3821f18b2467828f60b2a10b18890bf9e8f41aa5b4317cac45f62135e4764877a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (4.0.2)
+    trusty-cms (4.1.0)
       RedCloth (= 4.3.2)
       acts_as_list (>= 0.9.5, < 1.1.0)
       acts_as_tree (>= 2.6.1, < 2.9.0)
@@ -168,7 +168,7 @@ GEM
       multipart-post
     launchy (2.5.0)
       addressable (~> 2.7)
-    libv8 (7.3.492.27.1)
+    libv8 (7.3.492.27.1-x86_64-darwin-18)
     loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -211,7 +211,7 @@ GEM
       pry (~> 0.13.0)
     public_suffix (4.0.3)
     rack (2.0.9)
-    rack-cache (1.11.0)
+    rack-cache (1.11.1)
       rack (>= 0.4)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -275,7 +275,7 @@ GEM
     rspec-support (3.9.2)
     ruby_parser (3.14.2)
       sexp_processor (~> 4.9)
-    sassc (2.2.1)
+    sassc (2.3.0)
       ffi (~> 1.9)
     sassc-rails (2.1.2)
       railties (>= 4.0.0)

data/app/assets/javascripts/admin.js

@@ -34,3 +34,6 @@
 //= require 'admin/tags'
 //= require 'admin/treetable'
 //= require 'admin/sortable'
+//= require 'tablesaw/dist/tablesaw.jquery.js'
+//= require 'tablesaw/dist/tablesaw-init.js'
+//= require '@fortawesome/fontawesome-free/js/all.js'

data/app/assets/javascripts/admin/more-or-less.js

@@ -15,9 +15,9 @@
 
     $(link).toggleClass('less more');
     if (link.innerHTML.match(/less/i)) {
-      link.innerHTML = 'More';
+      link.innerHTML = 'More <i class="fas fa-angle-down"></i>';
     } else if (link.innerHTML.match(/more/i)) {
-      link.innerHTML = 'Less';
+      link.innerHTML = 'Less <i class="fas fa-angle-up"></i>';
     }
   }
 

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

@@ -33,8 +33,7 @@
     }
 
   TabControl.addTab = function(tabText) {
-    var relative_url_root = "<%= ActionController::Base.relative_url_root %>";
-    $('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>");
+    $('div#tab_control .tabs').append("<a id='tab_" + tabText + "' href='#' class='tab'><span>" + tabText + "</span><i class='fas fa-times-circle close' title='Remove part'></i></a>");
     var $page_part_index = $('#page_part_index_field');
     $page_part_index.val(parseInt($page_part_index.val()) + 1);
   }

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

@@ -1,16 +1,32 @@
 // Fonts
-$base-font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
-$base-font-size: 15px;
+$base-font-family: "Open Sans", sans-serif;
+$base-font-size: 16px;
+
+//colors
+$white: #FFFFFF;
+$light-blue: #e0f0ff;
+$dark-blue: #3C3A4B;
+$darker-blue: #292733;
+
+$dark-gray: #3A3A3A;
+$gray: #919191;
+$light-gray: #F3F3F4;
+
+$dark-red: #8C0E19;
+$red: #BA1321;
+$light-red: #f3c2c2;
+
 
 // Links
-$base-link-color:#94BDC3 ;
-$alt-link-color: red;
+$base-link-color: #3c3a4b;
+$alt-link-color: #8C0E19;
 
 // Header
-$header: #000 !default;
-$primary-tab: rgba(236, 6, 115, 0.6);
+$header: #3c3a4b !default;
+$primary-tab: #3c3a4b;
 $primary-tab-current: white;
 
 // Modules
 @import "modules/links";
 @import "modules/boxes";
+@import "modules/buttons";

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

@@ -5,13 +5,14 @@ $font_2: Times New Roman;
 $font_3: Times;
 $font_4: serif;
 
-#content {
+.content {
   table.index {
     tr.node {
       td {
         padding: .5em;
       }
     }
+
     &.node {
       &.site {
         small {
@@ -21,28 +22,45 @@ $font_4: serif;
           font-weight: normal;
           margin-left: .5em;
         }
+
         a {
           &:visited {
+            color: black;
             font-size: 115%;
             font-weight: bold;
-            color: black;
             text-decoration: none;
           }
         }
       }
     }
   }
+
   .form-area {
     p {
       &.domain {
         float: left;
-        width: 40%;
         margin: 1em 1em 0 0;
         overflow: hidden;
+        width: 40%;
+
+        label {
+          display: block;
+          position: relative;
+        }
+      }
+
+      &.homepage {
+        float: right;
+        margin: 1em 0 0;
+        overflow: hidden;
+        width: 16%;
+
         label {
-          
+          display: block;
+          position: relative;
         }
       }
+
       &.subtitle {
         margin: 1em 0 0 0;
       }
@@ -50,28 +68,9 @@ $font_4: serif;
   }
 }
 
-
-#content {
-	div.form-area p.homepage {
-		float: right;
-		width: 16%;
-		margin: 1em 0 0;
-		overflow: hidden;
-	}
-	.form-area p {
-		&.domain label {
-			display: block;
-			position: relative;
-		}
-		&.homepage label {
-			display: block;
-			position: relative;
-		}
-	}
-}
 p.formnote {
-	clear: both;
-	padding: 2em 0;
+  clear: both;
+  padding: 2em 0;
 }
 
 
@@ -79,7 +78,7 @@ p.formnote {
 //original selectors
 //#content div.form-area p.domain .textbox, #content div.form-area p.homepage .textbox, #content div.form-area p.subtitle .textbox, #content div.form-area p.subtitle select
 %extend_1 {
-	font-family: $font_0, $font_1, $font_2, $font_3, $font_4;
-	font-size: 140%;
-	width: 100%;
-}
+  font-family: $font_0, $font_1, $font_2, $font_3, $font_4;
+  font-size: 140%;
+  width: 100%;
+}

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

@@ -5,17 +5,17 @@ del, dfn, em, img, ins, kbd, q, s, samp,
 small, strike, strong, sub, sup, tt, var,
 b, u, i, center,
 dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
+fieldset, form, label, legend, input,
 table, caption, tbody, tfoot, thead, tr, th, td,
 article, aside, canvas, details, embed,
 figure, figcaption, footer, header, hgroup,
 menu, nav, output, ruby, section, summary,
 time, mark, audio, video {
-  margin: 0;
-  padding: 0;
   border: 0;
   font: inherit;
   font-size: 100%;
+  margin: 0;
+  padding: 0;
   vertical-align: baseline;
 }
 
@@ -33,14 +33,15 @@ table {
 }
 
 caption, th, td {
-  text-align: left;
   font-weight: normal;
+  text-align: left;
   vertical-align: middle;
 }
 
 q, blockquote {
   quotes: none;
 }
+
 q:before, q:after, blockquote:before, blockquote:after {
   content: "";
   content: none;

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

@@ -1,73 +1,48 @@
 //colors
-$color_turquoise_blue_approx: #66d9e0;
-$white: #fff;
-$black: #000;
 
-#site_chooser {
-	width: 20%;
-	border-collapse: collapse;
-	float: right;
+.site_chooser {
+  border-collapse: collapse;
+  float: left;
+  padding-left: 1em;
+  width: fit-content;
 }
-#nav {
-	list-style: none;
-	font-weight: bold;
-	margin-bottom: 10px;
-	width: 100%;
-	padding-top: 10px;
-	padding-bottom: 10px;
-	padding-left: 5px;
-	margin: 0;
-	cursor: pointer;
-	li {
-		margin-right: 10px;
-		position: relative;
-		color: $color_turquoise_blue_approx;
-		&:hover {
-			a {
-				background: $black;
-				text-decoration: underline;
-			}
-			ul a {
-				text-decoration: none;
-			}
-		}
-	}
-	a {
-		display: block;
-		padding: 5px;
-		color: $white;
-		background: $black;
-		text-decoration: none;
-		&:hover {
-			color: $white;
-			background: $black;
-			text-decoration: underline;
-		}
-		&.site-link:hover {
-			color: $color_turquoise_blue_approx;
-			transition: all 0.2s;
-		}
-	}
-	ul {
-		background: $white;
-		background: rgba(255,255,255,0);
-		list-style: none;
-		position: absolute;
-		margin-top: 10px;
-		visibility: hidden;
-		opacity: 0;
-		transition: opacity 0.2s;
-		li {
-			float: none;
-		}
-		a {
-			white-space: nowrap;
-		}
-	}
-	&:hover ul {
-		visibility: visible;
-		opacity: 1;
-		transition: opacity 0.2s;
-		z-index: 99999;
-	}
+
+.nav {
+  color: $white;
+  cursor: pointer;
+  font-weight: bold;
+  list-style: none;
+  padding: 1em;
+
+  ul {
+    opacity: 0;
+    position: absolute;
+    transition: opacity 0.2s;
+    visibility: hidden;
+
+    li {
+      padding: 0.75em 5em 0.5em 1em;
+      position: relative;
+
+      &:hover {
+        background-color: darken($dark-blue, 15%);
+        cursor: pointer;
+      }
+    }
+
+    a {
+      color: $white;
+      text-decoration: none;
+      white-space: nowrap;
+    }
+  }
+
+  &:hover ul {
+    background-color: $dark-blue;
+    margin-top: 1em;
+    opacity: 1;
+    transition: opacity 0.2s;
+    visibility: visible;
+    z-index: 99999;
+  }
 }

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

@@ -1,74 +1,50 @@
-p.asset {
-  img.preview {
-    border: 5px solid white;
-    box-shadow: 0 5px #333;
-}
-}
+.search {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
 
-.asset_filters {
-  float: left;
-  padding: 2px 0;
-  a {
-    border-radius: 100px;
-    color: #555555;
-    padding: 3px 8px;
-    text-decoration: none;
-    font-size: 12px;
-    &:hover {
-      background: #cccccc;
+  .asset_filters {
+
+    a {
+      border: 1px solid #3c3a4b;
+      display: inline-block;
+      margin: 0.25em;
+      padding: 0.5em 0.75em;
+      text-decoration: none;
+
+      &:hover, &.pressed {
+        background-color: #3c3a4b;
+        color: #ffffff;
+      }
+    }
   }
-    &.pressed {
-      background: #888888;
-      box-shadow: inset 0 1px 1px #333;
-      color: white;
-      text-shadow: 0 1px 0 #333333;
-      &:hover {
-        background: #888888;
-        box-shadow: inset 0 1px 1px #333;
-        color: white;
-        text-shadow: 0 1px 0 #333333;
+
+  .asset_search {
+    display: inline-block;
+
+    svg, input {
+      display: inline;
     }
   }
 }
-}
+
 
 .popup {
   div.toolbar {
-    background: white;
-    background-image: linear-gradient(#ffffff, #dddddd);
-    border-bottom: 1px solid #cccccc;
-    box-shadow: 0 1px 0 white;
+    border-bottom: 1px solid #f3f3f4;
+    font-size: 95%;
     margin: -20px -20px 0;
     padding: 6px 10px 3px 10px;
-    font-size: 95%;
-    height: 30px;
+
     &:after {
       clear: both;
       content: "";
       display: block;
     }
-    .right {
-      float: right;
-  }
-    form.search {
-      padding: 4px 2px 0;
-      input[type=search] {
-        font-size: 12px;
-        border-radius: 100px;
-        border: 1px solid #cccccc;
-        border-top-color: #999999;
-        border-left-color: #b0b0b0;
-        border-right-color: #bbbbbb;
-        background: white url("/assets/admin/search.png") 4px center no-repeat;
-        box-shadow: inset 0 1px 0 rgba(black, 0.2);
-        width: 180px;
-        padding: 2px 8px 2px 20px;
-    }
   }
-}
+
   #assets_table.assets {
     overflow: auto;
-}
+  }
 }
 
 #upload_holders {
@@ -77,215 +53,236 @@ p.asset {
 
 #attach_asset {
   .viewport {
+    height: 50vh;
     overflow-x: hidden;
-    width: 610px;
-    height: 310px;
-}
+    width: 75vw;
+  }
 }
 
 .attachment_actions {
-  text-align: right;
   margin-bottom: -1em;
+  text-align: right;
+
   ul {
     list-style-type: none;
+
     &, & li {
+      display: inline;
       margin: 0;
       padding: 0;
-      display: inline;
     }
   }
+
   li {
     padding-left: 1em;
-}
+  }
+
   a {
     color: white !important;
     text-shadow: 1px 1px 0 #888888;
+  }
 }
+
+.asset_attachment {
+  margin-bottom: 2em;
+  position: relative;
+
+  .attach-assets {
+    .message {
+      margin: 1em 0;
+    }
+  }
 }
 
 .assets {
   height: 150px;
-  padding-left: 5px;
-  padding-right: 5px;
+
   ul {
     li.asset {
       display: block;
       float: left;
+      height: 100px;
       margin: 1em;
-      width: 110px;
-      height: 110px;
       position: relative;
-      line-height: 1.2em;
+      width: 100px;
+
       .front, .back {
-        display: block;
         background: #e6eaed;
         border: 5px solid white;
-        position: absolute;
-        width: 100px;
+        display: block;
         height: 100px;
+        position: absolute;
         text-align: center;
-    }
-      .front {
-        box-shadow: 0 5px #333;
-        text-align: center;
-    }
+        width: 100px;
+      }
+
       .back {
         color: #333333;
-        overflow: hidden;
         opacity: 0;
-    }
+        overflow: hidden;
+      }
+
       .title {
         color: #333333;
         font-size: 10px;
-        overflow: hidden;
-        margin: 10px 4px;
         height: 15px;
         line-height: 15px;
+        margin: 10px 4px;
+        overflow: hidden;
         text-overflow: ellipsis;
-    }
+      }
+
       .icon {
         height: 63px;
         line-height: 63px;
+
         img {
           vertical-align: bottom;
+        }
       }
-    }
+
       ul.actions {
         li {
+          font-size: 10px;
           margin: 5px 0;
           padding: 0 10px;
-          font-size: 10px;
-      }
+        }
+
         a {
           background: #666666;
-          background: rgba(black, 0.8);
-          border-radius: 5px;
-          color: #dddddd;
+          background: rgba(#000, 0.8);
+          color: #ffffff;
           display: block;
-          padding: 2px 10px;
+          padding: 0.5em;
           text-decoration: none;
+
           &:hover {
             background: #999999;
             background: rgba(black, 0.6);
             color: white;
+          }
         }
       }
-    }
+
       &.unsaved {
         .front {
           opacity: 0.4;
+        }
       }
-    }
+
       &:hover {
         .back {
-          opacity: 1;
           background: rgba(white, 0.6);
+          opacity: 1;
+        }
       }
-    }
+
       &.waiting {
         background-color: #e6eaed;
+
         .back {
           display: none;
-      }
+        }
+
         .front {
           background: transparent url(/assets/admin/spinner.gif) no-repeat center center;
+
           img {
             opacity: 0.2;
+          }
         }
       }
     }
   }
 }
-}
+
 
 #attachment_list.assets {
   border-bottom-left-radius: 5px;
   border-bottom-right-radius: 5px;
   margin: -1em 0.5em 1em 0.5em;
-  overflow-y: hidden;
-  overflow-x: auto;
+  overflow: auto;
+
   ul.empty {
     display: none;
-}
+  }
+
   p.note {
+    clear: left;
     margin: 0;
     padding: 8px;
-    clear: left;
+
     span.message {
-      float: right;
       color: #aaaaaa;
+      float: right;
+
       &.important {
         color: #dd9999;
+      }
     }
   }
-}
+
   ul.sortable {
     li.asset {
       div.back {
         cursor: move;
+      }
     }
   }
 }
-}
 
 #assets_table.assets {
-  position: relative;
   font-size: 75%;
+  position: relative;
+
   p {
-    padding: 40px {
-      top: 45px;
-  };
     color: silver;
-    text-align: center;
     font-style: oblique;
-}
+    padding: 45px 40px;
+    text-align: center;
+  }
+
   ul {
     clear: both;
+
     li.asset {
       input {
         display: none;
+      }
     }
   }
-}
-  div.pagination {
-    position: relative;
-    overflow: hidden;
-    clear: left;
-    width: 100%;
-    height: 3em;
-    padding: 0.5em 0;
-    span, a, em {
-      display: block;
-      float: left;
-      padding: 0.25em;
-      margin: 1em 2px 1em 0;
-      border-radius: 2px;
+
+  .pagination {
+    clear: both;
+    padding: 1em;
+
+    a, .current {
+      border-bottom: 1px solid #3c3a4b;
+      border-left: 1px solid #3c3a4b;
+      border-right: 1px solid #3c3a4b;
+      border-top: 1px solid #3c3a4b;
+      margin-left: -5px;
+      padding: 0.15em 0.85em;
       text-decoration: none;
-  }
-    span.current {
-      color: black;
-      font-weight: bold;
-  }
-    span.disabled {
-      background-color: #eeeeee;
-      color: #cccccc;
-  }
-    a {
-      background-color: #eeeeee;
-      color: #444444;
+
       &:hover {
-        background-color: #BC045C;
-        color: white;
+        background-color: #3c3a4b;
+        color: #ffffff;
+      }
+    }
+
+    .current {
+      background-color: #3c3a4b;
+      color: #ffffff;
+    }
+
+    .previous_page, .next_page {
+      border: none;
+      margin-right: 0.5em;
+    }
+
+    .gap {
+      margin-right: 0.5em;
     }
   }
-    span {
-      color: #888888;
-  }
-    span, a {
-      display: block;
-      float: left;
-      padding: 2px 6px;
-      line-height: 1.5em;
-  }
-}
 }