caboose-cms 0.9.104 → 0.9.105

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 294843f8b9534fe9e135c55a88dc94445b156903
-  data.tar.gz: 68170c056570399180addfa83ac541a464032546
+  metadata.gz: c91b1719a19dc633fe8e4487e7f367d37667a76c
+  data.tar.gz: af5a3af76d2670ea0b1c8b629f8d0ab4ee014883
 SHA512:
-  metadata.gz: 8d27d700b0862b7de7e30e148e326cd46999561dc0f4e5c1ac5a6b32401a6965f24d1fea3ea3e6abbd095d041c596a61f687a61be65e07221c3344f380282a86
-  data.tar.gz: 0c4a7d1ebaa5088200068acb16532c48d5cc0621f575899d8243ff42549f3c1ffb8738872898ded5f45fe6509d21a1ee9aa00e8a4dd06dc90aeb43dba8071457
+  metadata.gz: c180fba3f360817124a39cece4cf35864314217adaf9699abb0399780bc58cef59f9ebe961c38269b5399ed3cae3aaffd6634c601beb7f8ed326508998ae25de
+  data.tar.gz: b9085bc03d7cecf21126fc5d3361b7cce059acbc93e8645ae6e7f9ff1522aad52d0c0cdc8a4768ca5914058076d8ea033346be925c424723d05730a3f9574439

data/app/assets/stylesheets/caboose/admin_crumbtrail.css.scss

@@ -121,6 +121,147 @@ $current-text-color: #ccc;
 		}
 	}
 }
+
+#page-list {
+	max-width: 640px;
+	margin: 0 auto;
+	padding: 0 20px 100px 20px;
+	.top {
+		margin-bottom: 20px;
+		p {
+			margin: 0;
+			float: left;
+		}
+		input {
+			border: 1px solid #c5c5c5;
+	    border-radius: 8px;
+	    padding: 8px 8px 8px 8px;
+	    font-size: 14px;
+	    height: 33px;
+	    float: right;
+		}
+	}
+	ul {
+		list-style-type: none;
+		padding: 0;
+		margin: 0;
+		padding-left: 15px;
+		overflow: hidden;
+		position: relative;
+		&::before {
+			content: " ";
+			display: block;
+			position: absolute;
+			left: 0;
+			top: -21px;
+			width: 1px;
+			height: 100%;
+			background-color: #dadada;
+		}
+		li {
+			display: block;
+			position: relative;
+			a.icon3-settings {
+				position: absolute;
+		    right: 4px;
+		    top: 8px;
+		    font-size: 0;
+		    color: transparent;
+		    width: 23px;
+		    height: 23px;
+		    display: inline-block;
+		    text-decoration: none;
+		    z-index: 2;
+				&::before {
+					font-size: 20px;
+					color: #2d2d2d;
+				}
+				&:hover {
+					&::before {
+						color: #1c1ccc;
+					}
+				}
+			}
+			a.content {
+				text-decoration: none;
+				color: #2d2d2d;
+				display: block;
+				margin-bottom: 5px;
+				border: 1px solid #c5c5c5;
+				border-radius: 8px;
+				padding: 8px 8px 8px 30px;
+				font-size: 14px;
+				&:hover {
+					background-color: #e7e7ff;
+					border-color: #a6a6af;
+				}
+				&::before {
+					content: "\70";
+					font-family: "caboose-admin-menu" !important;
+					font-size: 20px;
+			    position: absolute;
+			    left: 5px;
+			    top: 7px;
+				}
+			}
+			span.disabled {
+				text-decoration: line-through;
+  			color: #888888;
+			}
+			&::before {
+				content: " ";
+				display: block;
+				position: absolute;
+				right: 100%;
+				top: 17px;
+				width: 50px;
+				height: 1px;
+				background-color: #dadada;
+			}
+			&.hidden {
+				& > a.content, & > a.icon3-settings {
+					display: none;
+				}
+				&::before {
+					display: none;
+				}
+			}
+			&.shown {
+				& > a.content {
+					display: block;
+				}
+				& > a.icon3-settings {
+					display: inline-block;
+				}
+			}
+			&.small {
+				&::before {
+					top: 11px;
+				}
+				& > a.content {
+					font-size: 11px;
+					padding: 4px 8px 3px 8px;
+					background-color: #eaeaea;
+					&::before {
+						display: none;
+					}
+				}
+				& > a.icon3-settings {
+					display: none;
+				}
+			}
+		}
+	}
+	& > ul {
+		border-left: 0;
+		padding-left: 0;
+		&::before {
+			top: 10px;
+			height: calc(100% - 31px);
+		}
+	}
+}
+
   
 ul#crumbtrail {
   position: absolute;

data/app/assets/stylesheets/caboose/admin_main.css

@@ -158,7 +158,7 @@ body * {
   position: relative;
 }
 #content {
-  padding: 0 0 0 30px;
+  padding: 0 0 100px 30px;
 }
 
 h1,h2,h3,h4,h5,h6 {

data/app/assets/stylesheets/caboose/cart.css.scss

@@ -23,7 +23,6 @@
     border-radius: 0;
     border-width: 1px;
     color: #565656;
-    font: 1em "Klinic Slab",serif;
     padding: 8px 6px 6px;
     text-align: right !important;
   }
@@ -38,7 +37,6 @@
     color: #fff;
     cursor: pointer;
     display: block-inline;
-    font: 20px/1em "Klinic Slab",serif;
     margin-top: 20px;
     padding: 8px 15px 6px 15px;
     text-align: center;

data/app/helpers/caboose/pages_helper.rb

@@ -1,23 +1,24 @@
 module Caboose
   module PagesHelper
     def pages_list(page)
+      is_admin = @logged_in_user && @logged_in_user.is_allowed('all', 'all')
       str = "<ul>"
-      str << pages_list_helper(page)      
+      str << pages_list_helper(page, is_admin)      
       str << "</ul>"
       return str
     end
     
-    def pages_list_helper(page)
-      can_edit = (@logged_in_user && (@logged_in_user.is_allowed('all', 'all') || Page.permissible_actions(@logged_in_user, page.id).include?('edit'))) ? true : false
-      if can_edit
-        str = "<li><a href='/admin/pages/#{page.id}/content'>#{page.title}</a>"
+    def pages_list_helper(page, is_admin)
+      if is_admin || ((@logged_in_user && Page.permissible_actions(@logged_in_user, page.id).include?('edit')) ? true : false)
+        str = "<li><a class='content' href='/admin/pages/#{page.id}/content'>#{page.title}</a><a class='icon3-settings' href='/admin/pages/#{page.id}'>Settings</a>"
       else
         str = "<li><span class='disabled'>#{page.title}</span>"
       end
-      if page.children && page.children.count > 0
+      pchildren = page.children.select([:id, :title])
+      if pchildren && pchildren.count > 0
         str << "<ul>"
-        page.children.each do |p|
-          str << pages_list_helper(p)
+        pchildren.each do |p|
+          str << pages_list_helper(p, is_admin)
         end
         str << "</ul>"
       end

data/app/views/caboose/admin/index.html.erb

@@ -15,10 +15,6 @@ width = 200
     <p>For assistance, please email <a href="mailto:support@nine.is">support@nine.is</a>.</p>
   </div>
 <ul>
-  <!--
-  <li id='nav_item_logout'><a href='/logout'><span class='icon'></span><span class='text'>Logout</span></a>
-  <li id='nav_item_myaccount'><a href='/my-account'><span class='icon'></span><span class='text'>My Account</span></a>
-  -->
   <% i = 0 %>
   <% @nav.each do |item| %>
     <% id = item['id'].nil? ? i.to_s : item['id'] %>

data/app/views/caboose/pages/_admin_header.html.erb

@@ -4,12 +4,13 @@
 p.uri {
   background: #efefef;
   border: #999 1px solid;
-  padding: 10px;
+  padding: 9px 10px;
   position: absolute;
-  top: 8px;
+  top: 9px;
   left: 251px;
-  height: 17px;
+  height: 36px;
   margin: 0;
+  font-size: 14px;
 }
 
 </style>

data/app/views/caboose/pages/admin_edit_general.html.erb

@@ -20,17 +20,6 @@
 <% content_for :caboose_css do %>
 <style type='text/css'>
 
-p.uri {
-background: #efefef;
-    border: #999 1px solid;
-    padding: 10px;
-    position: absolute;
-    top: 8px;
-    left: 251px;
-    height: 17px;
-    margin: 0;
-}
-
 div.field_with_explanation {
   width: 420px;
   background: #efefef;

data/app/views/caboose/pages/admin_index.html.erb

@@ -1,35 +1,58 @@
 <h1>Pages</h1>
 
 <% if @domain %>
-	<% if @user.is_allowed('pages','add') %>
-  <p><a href='/admin/pages/new' class="caboose-btn-white">New Page</a></p>
-  <% end %>
   <div id="page-list">
-  <%= raw pages_list(@home_page) %>
+  	<div class="clearfix top">
+  		<% if @user.is_allowed('pages','add') %>
+			  <p><a href='/admin/pages/new' class="caboose-btn-white">New Page</a></p>
+			<% end %>
+			<input type="text" id="pages-filter" placeholder="Filter" />
+  	</div>
+  	<%= raw pages_list(@home_page) %>
+  	<p id="no-results"></p>
   </div>
 <% else %>
   <p>It doesn't look like this site is configured for the current domain.  Please <a href='/admin/sites'>configure your sites</a>.</p>
-<% end %>  
+<% end %>
 
 <% content_for :caboose_css do %>
-<style>
-	#page-list ul li {
-		line-height: 26px;
-	}
-	#page-list ul li a {
-		color: #2424b1;
-		text-decoration: none;
-	}
-	#page-list ul li a:visited {
-		color: #824daf;
-	}
-	#page-list ul li a:hover {
-		color: #24b14b;
-		text-decoration: underline;
-	}
-	#page-list ul li span.disabled {
-		text-decoration: line-through;
-    color: #888888;
+<%= stylesheet_link_tag 'caboose/admin_menu_icons' %>
+<% end %>
+
+<% content_for :caboose_js do %>
+<script>
+	jQuery.expr[":"].Contains = jQuery.expr.createPseudo(function(arg) {
+    return function( elem ) {
+    	return jQuery(elem).text().toUpperCase().indexOf(arg.toUpperCase()) >= 0;
+    };
+	});
+	function filter_pages() {
+		var results = 0;
+		var q = $("#pages-filter").val().toUpperCase();
+		if ( !q || q == '' || q == 'FILTER' ) {
+			$("#page-list li").removeClass('small').addClass('shown').removeClass('hidden');
+			$("#no-results").text('');
+		}
+		else {
+			$("#page-list li").addClass('hidden').removeClass('small').removeClass('shown');
+			$("#no-results").text('');
+			$.each($("a.content:Contains(" + q + ")"), function(k,v) {
+				$(v).closest('li').addClass('shown').removeClass('hidden');
+				$.each($(v).parents("li"), function(a,b) {
+					var t1 = $(b).children("a.content").text().toUpperCase();
+					if ( $(b).children("a.content").text().toUpperCase().indexOf(q) < 0 )
+						$(b).addClass('small');
+					$(b).addClass('shown').removeClass('hidden');
+				});
+				$(v).closest("li").removeClass('small');
+				results += 1;
+			});
+			if ( results == 0 )
+				$("#no-results").text("Sorry, no matching pages were found.");
+		}
 	}
-</style>
+	$("#pages-filter").keyup(function() {
+		filter_pages();
+	});
+</script>
 <% end %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.104'
+  VERSION = '0.9.105'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.104
+  version: 0.9.105
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-11 00:00:00.000000000 Z
+date: 2018-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg