caboose-cms 0.9.105 → 0.9.106

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c91b1719a19dc633fe8e4487e7f367d37667a76c
-  data.tar.gz: af5a3af76d2670ea0b1c8b629f8d0ab4ee014883
+  metadata.gz: b2582096246cab8ae4b3d29739b2d2235ea7902d
+  data.tar.gz: 6dbe124afb37cc6d8946ee06717ba08d295f5e43
 SHA512:
-  metadata.gz: c180fba3f360817124a39cece4cf35864314217adaf9699abb0399780bc58cef59f9ebe961c38269b5399ed3cae3aaffd6634c601beb7f8ed326508998ae25de
-  data.tar.gz: b9085bc03d7cecf21126fc5d3361b7cce059acbc93e8645ae6e7f9ff1522aad52d0c0cdc8a4768ca5914058076d8ea033346be925c424723d05730a3f9574439
+  metadata.gz: 16f7e167f36b59ce3667f8ed377d57d58470f0e240aff437f8062a07583b69b20a8ae3fb33cc09798d26d6543fdcb3308e22a63e11e5a39ce6d24cb3a4d385cc
+  data.tar.gz: f72a582447399cbd4f8dae7d7ae6208070bffa9792f3ebd1724b7f7d396d32dea964f78c690de28c8ad23f4af0d48202f6554568338b03422e75f217c7c33330

data/app/assets/fonts/caboose/caboose-admin-menu.svg

@@ -83,4 +83,6 @@
 <glyph glyph-name="money" unicode="&#44;" d="M221 409c-8-1-18-4-25-8-9-5-16-11-22-19-7-9-11-20-11-33 0-18 7-32 19-43 9-8 21-14 36-19l22-6 0 131c0 0-8 0-19-3z m3-107c-12 4-24 9-32 16-9 8-13 18-13 31 0 9 3 17 7 23 5 6 10 11 17 15 6 3 14 5 21 7z m124-87c-8 9-18 15-28 18-9 3-18 6-28 9l-20 5 0-145c0 0 12 0 18 1 7 1 11 2 17 4 13 4 23 9 31 15 9 7 16 15 20 24 3 9 5 18 5 27 0 18-5 32-15 42z m-5-62c-3-7-8-13-14-18-7-5-16-10-27-13-4-1-8-2-14-3l0 107c10-3 18-5 26-8 8-3 16-7 23-14 7-7 10-17 10-31 0-7-1-14-4-20z m68 56c-3 9-8 18-14 27-6 8-14 16-24 22-9 7-21 12-33 15-6 2-15 4-26 7-9 2-17 4-26 6l0 106c9-2 15-6 22-10 14-10 23-25 26-46l69 0c-1 18-5 33-12 46-8 15-19 27-33 37-14 10-30 17-48 22-8 3-15 4-24 6l0 33-64 0 0-33c-7-1-15-3-22-4-18-5-33-11-46-20-14-9-25-20-33-34-8-13-12-29-12-48 0-9 1-19 4-28 3-9 7-18 14-26 7-8 15-16 27-23 11-6 24-12 41-16 9-2 19-4 27-6l0-120c-11 3-22 8-31 14-9 6-16 14-21 23-5 10-7 21-7 33l-69 0c1-21 5-39 14-55 8-17 20-30 35-41 15-11 31-18 51-23 9-3 19-4 28-6l0-35 64 0 0 35c10 1 19 2 29 4 18 5 35 11 50 21 15 9 26 21 35 35 9 15 14 32 14 53 0 10-2 19-5 29z m-22-73c-8-13-18-23-31-31-13-8-28-14-45-18-9-2-17-4-26-5l-15-1 0-33-32 0 0 33-14 2c-9 1-18 3-26 5-18 5-33 12-46 21-13 9-23 21-30 35-5 10-9 21-10 32l36 0c2-8 4-17 8-24 6-12 15-22 26-30 11-7 24-12 36-15 12-4 20-4 20-4l0 151-12 3c-5 1-11 3-16 4-4 1-7 2-11 3l0 0 0 0c-15 3-27 8-37 14-10 6-17 12-23 19-5 6-9 13-11 21-2 7-3 15-3 23 0 16 3 29 10 40 7 11 16 21 28 28 12 8 25 14 41 18 6 2 13 3 20 4l14 2 0 31 32 0 0-31 13-2c7-1 14-3 23-5 16-4 31-11 43-20 11-8 21-19 28-32 4-7 6-14 8-22l-38 0c-5 19-15 34-30 43-9 6-18 9-28 12-9 3-19 4-19 4l0-137 13-3c7-2 14-4 21-6l4-1 1 0c11-3 19-5 24-6 11-3 21-8 29-13 8-6 15-12 20-19 6-7 10-14 12-22 3-8 4-16 4-24 0-17-4-32-11-44z"/>
 <glyph glyph-name="rss" unicode="&#45;" d="M120 176c-31 0-56-25-56-56 0-31 25-56 56-56 31 0 56 25 56 56 0 31-25 56-56 56z m0-96c-22 0-40 18-40 40 0 22 18 40 40 40 22 0 40-18 40-40 0-22-18-40-40-40z m-56 240l0-80c48 0 94-14 128-48 34-34 48-80 48-128l80 0c0 140-116 256-256 256z m240-240l-48 0c-4 50-21 92-53 123-31 32-73 49-123 53l0 47c26-1 52-8 77-18 28-12 54-30 76-52 22-22 40-48 52-76 11-25 17-51 19-77z m-240 368l0-80c171 0 304-133 304-304l80 0c0 212-172 384-384 384z m227-157c-56 57-130 89-211 93l0 48c190-9 344-162 352-352l-48 0c-4 81-37 155-93 211z"/>
 <glyph glyph-name="stack" unicode="&#46;" d="M71 347l169-81c4-2 10-3 16-3 6 0 12 1 16 3l169 81c9 5 9 12 0 16l-169 82c-4 2-10 3-16 3-6 0-12-1-16-3l-169-82c-9-4-9-11 0-16z m176 83c1 1 5 2 9 2 4 0 8-1 9-2l156-75-156-75c-1-1-5-1-9-1-4 0-7 0-9 1l-156 75z m194-166c0 0-31 15-35 17-4 2-5 2-9 0-4-2-125-61-125-61-4-2-10-3-16-3-6 0-12 1-16 3 0 0-117 57-123 60-6 3-8 3-13 0-6-3-33-16-33-16-9-4-9-11 0-16l169-81c4-3 10-4 16-4 6 0 12 1 16 4l169 81c9 4 9 11 0 16z m-176-83c-1-1-5-2-9-2-4 0-7 1-9 2l-156 75 19 9 123-59c6-3 15-5 23-5 9 0 17 2 23 5l123 59 19-9z m176-17c0 0-31 15-35 17-4 2-5 2-9 0-4-2-125-60-125-60-4-2-10-3-16-3-6 0-12 1-16 3 0 0-117 57-123 59-6 3-8 3-13 1-6-3-33-17-33-17-9-4-9-11 0-15l169-82c4-2 10-3 16-3 6 0 12 1 16 3l169 82c9 4 9 11 0 15z m-176-82c-1-1-5-2-9-2-4 0-7 1-9 2l-156 75 19 9 123-60c6-3 15-4 23-4 9 0 17 1 23 4l123 60 19-9z"/>
+<glyph glyph-name="hidden" unicode="&#47;" d="M316 316c-4 4-11 4-15 0-4-4-4-11 0-15 12-12 19-28 19-45 0-35-29-64-64-64-17 0-33 7-45 19-4 4-11 4-15 0-4-4-4-11 0-15 16-16 37-25 60-25 47 0 85 38 85 85 0 23-9 44-25 60z m-45 24c-5 1-10 1-15 1-47 0-85-38-85-85 0-5 0-10 1-15 1-5 6-9 11-9 0 0 1 0 2 0 5 2 9 7 8 13-1 3-1 7-1 11 0 35 29 64 64 64 4 0 8 0 11-1 6-1 11 3 13 9 1 5-3 11-9 12z m238-77c-2 3-60 70-139 111-5 3-12 1-15-4-2-5 0-12 5-15 61-31 110-81 127-99-25-28-126-128-231-128-36 0-72 9-107 26-6 2-12 0-14-5-3-6-1-12 4-14 39-19 78-28 117-28 131 0 249 136 253 142 4 4 4 10 0 14z m-183 130c-24 8-48 12-70 12-131 0-249-136-253-142-4-4-4-9-1-13 1-2 37-52 98-93 2-1 4-2 6-2 3 0 6 2 9 5 3 5 1 12-3 15-45 30-76 66-88 80 25 27 126 129 232 129 20 0 41-4 63-11 6-2 12 1 14 7 2 5-1 11-7 13z m119 52c-4 4-11 4-15 0l-363-363c-4-4-4-11 0-15 2-2 5-3 8-3 2 0 5 1 7 3l363 363c4 4 4 11 0 15z"/>
+<glyph glyph-name="visible" unicode="&#58;" d="M510 262c-4 6-101 143-254 143-131 0-249-136-253-142-4-4-4-10 0-14 4-6 122-142 253-142 131 0 249 136 253 142 4 4 4 9 1 13z m-254-134c-105 0-206 100-231 128 25 28 125 128 231 128 123 0 210-100 232-127-25-27-126-129-232-129z m0 213c-47 0-85-38-85-85 0-47 38-85 85-85 47 0 85 38 85 85 0 47-38 85-85 85z m0-149c-35 0-64 29-64 64 0 35 29 64 64 64 35 0 64-29 64-64 0-35-29-64-64-64z"/>
 </font></defs></svg>

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

@@ -123,7 +123,7 @@ $current-text-color: #ccc;
 }
 
 #page-list {
-	max-width: 640px;
+	max-width: 660px;
 	margin: 0 auto;
 	padding: 0 20px 100px 20px;
 	.top {
@@ -163,7 +163,7 @@ $current-text-color: #ccc;
 			position: relative;
 			a.icon3-settings {
 				position: absolute;
-		    right: 4px;
+		    right: 30px;
 		    top: 8px;
 		    font-size: 0;
 		    color: transparent;
@@ -182,14 +182,14 @@ $current-text-color: #ccc;
 					}
 				}
 			}
-			a.content {
+			.content {
 				text-decoration: none;
 				color: #2d2d2d;
 				display: block;
 				margin-bottom: 5px;
 				border: 1px solid #c5c5c5;
 				border-radius: 8px;
-				padding: 8px 8px 8px 30px;
+				padding: 8px 60px 8px 30px;
 				font-size: 14px;
 				&:hover {
 					background-color: #e7e7ff;
@@ -204,9 +204,27 @@ $current-text-color: #ccc;
 			    top: 7px;
 				}
 			}
-			span.disabled {
-				text-decoration: line-through;
-  			color: #888888;
+			a.pub {
+				position: absolute;
+		    right: 9px;
+		    top: 10px;
+		    font-size: 0;
+		    color: transparent;
+		    width: 17px;
+		    height: 16px;
+		    display: inline-block;
+		    text-decoration: none;
+		    z-index: 2;
+		    cursor: pointer;
+				&::before {
+					font-size: 17px;
+					color: #2d2d2d;
+				}
+				&:hover {
+					&::before {
+						color: #1c1ccc;
+					}
+				}
 			}
 			&::before {
 				content: " ";
@@ -219,7 +237,7 @@ $current-text-color: #ccc;
 				background-color: #dadada;
 			}
 			&.hidden {
-				& > a.content, & > a.icon3-settings {
+				& > .content, & > a.icon3-settings, & > a.pub {
 					display: none;
 				}
 				&::before {
@@ -227,10 +245,10 @@ $current-text-color: #ccc;
 				}
 			}
 			&.shown {
-				& > a.content {
+				& > .content {
 					display: block;
 				}
-				& > a.icon3-settings {
+				& > a.icon3-settings, & > a.pub {
 					display: inline-block;
 				}
 			}
@@ -238,7 +256,7 @@ $current-text-color: #ccc;
 				&::before {
 					top: 11px;
 				}
-				& > a.content {
+				& > .content {
 					font-size: 11px;
 					padding: 4px 8px 3px 8px;
 					background-color: #eaeaea;
@@ -246,7 +264,22 @@ $current-text-color: #ccc;
 						display: none;
 					}
 				}
-				& > a.icon3-settings {
+				& > a.icon3-settings, & > a.pub {
+					display: none;
+				}
+			}
+			&.disabled {
+				& > .content {
+					background: #d0d0d0;
+			    text-decoration: line-through;
+			    color: #5f5f5f;
+			    font-size: 11px;
+					padding: 4px 8px 3px 8px;
+					&::before {
+						display: none;
+					}
+				}
+				& > a.icon3-settings, & > a.pub {
 					display: none;
 				}
 			}

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

@@ -495,7 +495,7 @@ Page Bar Generator
   text-decoration: none;
 }
 
-#search_form input[type='text']   { height: 20px; padding: 6px 12px; }
+#search_form input[type='text']   { padding: 6px 12px; }
 #search_form input[type='submit'] { height: 35px; padding: 0 12px; }
 
 

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

@@ -46,15 +46,16 @@
     //    display: none;
       }
       a {
-        display: block;
-        margin: 0 0 2px 0;
-        padding: 5px 8px 3px 8px;
-        font-size: 14px;
-        line-height: 18px;
-        background: #efefef;
-        border: #c7c7c7 1px solid;
-        color: #292929;
-        text-decoration: none;
+          display: block;
+          margin: 0 0 3px 0;
+          padding: 4px 8px 4px 8px;
+          font-size: 13px;
+          line-height: 15px;
+          background: #f3f3f3;
+          border: #d8d8d8 1px solid;
+          color: #292929;
+          text-decoration: none;
+          border-radius: 4px;
         &:focus {
           outline-width: 0;
         }

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

@@ -265,4 +265,10 @@
 }
 .icon3-stack:before {
   content: "\2e";
-}
+}
+.icon3-hidden:before {
+  content: "\2f";
+}
+.icon3-visible:before {
+  content: "\3a";
+}

data/app/controllers/caboose/pages_controller.rb

@@ -209,6 +209,36 @@ module Caboose
         render :layout => 'caboose/admin'
       end
     end
+
+    # @route PUT /admin/pages/:id/show
+    def admin_show_page
+      return unless user_is_allowed('pages', 'edit')  
+      resp = StdClass.new({'attributes' => {}})    
+      @page = Page.find(params[:id])
+      if @page.site_id != @logged_in_user.site_id
+        redirect_to '/admin/pages'
+      else
+        @page.hide = false
+        @page.save
+        resp.success = true
+      end
+      render :json => resp
+    end
+
+    # @route PUT /admin/pages/:id/hide
+    def admin_hide_page
+      return unless user_is_allowed('pages', 'edit')  
+      resp = StdClass.new({'attributes' => {}})    
+      @page = Page.find(params[:id])
+      if @page.site_id != @logged_in_user.site_id
+        redirect_to '/admin/pages'
+      else
+        @page.hide = true
+        @page.save
+        resp.success = true
+      end
+      render :json => resp
+    end
     
     # @route PUT /admin/pages/:id/layout
     def admin_update_layout

data/app/helpers/caboose/pages_helper.rb

@@ -3,22 +3,24 @@ module Caboose
     def pages_list(page)
       is_admin = @logged_in_user && @logged_in_user.is_allowed('all', 'all')
       str = "<ul>"
-      str << pages_list_helper(page, is_admin)      
+      str << pages_list_helper(page, is_admin, true)      
       str << "</ul>"
       return str
     end
     
-    def pages_list_helper(page, is_admin)
+    def pages_list_helper(page, is_admin, is_top)
       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>"
+        str << "<a title='Hide Page' href='#' data-page='#{page.id}' class='pub icon3-visible'>Hide Page</a>" if !page.hide && !is_top
+        str << "<a title='Show Page' href='#' data-page='#{page.id}' class='pub icon3-hidden'>Show Page</a>" if page.hide
       else
-        str = "<li><span class='disabled'>#{page.title}</span>"
+        str = "<li class='disabled'><span class='content'>#{page.title}</span>"
       end
-      pchildren = page.children.select([:id, :title])
+      pchildren = page.children.select([:id, :title, :hide])
       if pchildren && pchildren.count > 0
         str << "<ul>"
         pchildren.each do |p|
-          str << pages_list_helper(p, is_admin)
+          str << pages_list_helper(p, is_admin, false)
         end
         str << "</ul>"
       end

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

@@ -17,11 +17,11 @@ end
 %>
 
 <h1>Categories</h1>
-<a href='/admin/categories/new'>New Category</a>
+<a class="caboose-btn" href='/admin/categories/new'>New Category</a>
 <%= category_list(@top_cat) %>
 
 <% content_for :caboose_js do %>
 <script type='text/javascript'>
 	
 </script>
-<% end %>
+<% end %>

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

@@ -36,11 +36,11 @@
 		else {
 			$("#page-list li").addClass('hidden').removeClass('small').removeClass('shown');
 			$("#no-results").text('');
-			$.each($("a.content:Contains(" + q + ")"), function(k,v) {
+			$.each($(".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 )
+					var t1 = $(b).children(".content").text().toUpperCase();
+					if ( $(b).children(".content").text().toUpperCase().indexOf(q) < 0 )
 						$(b).addClass('small');
 					$(b).addClass('shown').removeClass('hidden');
 				});
@@ -54,5 +54,26 @@
 	$("#pages-filter").keyup(function() {
 		filter_pages();
 	});
+	$(window).load(function() {
+		filter_pages();
+	});
+	$("a.pub").click(function(e) {
+		e.preventDefault();
+		var anc = $(this);
+		var page_id = anc.data('page');
+		var action = anc.hasClass('icon3-hidden') ? 'show' : 'hide';
+		$.ajax({
+	    url: '/admin/pages/' + page_id + '/' + action,
+	    type: 'put',
+	    success: function(resp) {
+	    	if (resp && resp.success) {
+		    	if ( action == 'show' )
+		    		anc.removeClass('icon3-hidden').addClass('icon3-visible').attr('title','Hide Page');
+		    	if ( action == 'hide' )
+		    		anc.removeClass('icon3-visible').addClass('icon3-hidden').attr('title','Show Page');
+		    }
+	    }
+	  });
+	});
 </script>
 <% end %>

data/app/views/caboose/users/admin_edit_password.html.erb

@@ -4,13 +4,32 @@
 <h2>Reset Password for <%= "#{@edituser.first_name} #{@edituser.last_name}" %></h2>
 <form action='/admin/users/<%= @edituser.id %>' method='put' id='password_form'>
 <input type='hidden' name='authenticity_token' value='<%= form_authenticity_token %>' />
-<p><input type='password' name='password'   id='password'   value="" placeholder='Password' /></p>
-<p><input type='password' name='password2'  id='password2'  value="" placeholder='Confirm password' /></p>
+<div class="field">
+  <label for="password">Password</label>
+  <input type='password' name='password'   id='password' style="width:250px;"   value=""  />
+</div>
+<div class="field">
+  <label for="password2">Confirm Password</label>
+  <input type='password' name='password2'  id='password2' style="width:250px;"  value=""  />
+</div>
 <div id='message'></div>
 <p><input type='button' value='Update Password' onclick="update_password();" /></p>
 
 <%= render :partial => 'caboose/users/admin_footer' %>
 
+<% content_for :caboose_css do %>
+<style>
+  .field {
+    margin-bottom: 15px;
+  }
+  .field label {
+    display: block;
+    margin-bottom: 4px;
+    font-size: 13px;
+  }
+</style>
+<% end %>
+
 <% content_for :caboose_js do %>
 <script type="text/javascript">
 

data/lib/caboose/version.rb

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

metadata

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