cortex-reaver 0.3.0 → 0.3.1

data/lib/cortex_reaver.rb

@@ -34,7 +34,7 @@ module CortexReaver
   require File.join(LIB_DIR, 'config')
 
   # Reload on sighup
-  trap 'HUP' do
+  trap 'USR1' do
     reload_app
   end
 
@@ -333,7 +333,7 @@ module CortexReaver
     
     begin
       # Try to shut down Ramaze nicely.
-      Process.kill('HUP', pid)
+      Process.kill('USR1', pid)
       puts "Done."
     rescue Errno::ESRCH
       # The process doesn't exist.
@@ -419,12 +419,13 @@ module CortexReaver
     end
 
     # Check schema
-    if check_schema and
-       Sequel::Migrator.get_current_migration_version(@db) !=
-       Sequel::Migrator.latest_migration_version(File.join(LIB_DIR, 'migrations'))
-
-      raise RuntimeError.new("database schema missing or out of date. Please run `cortex_reaver --migrate`.")
-    end
+    #TODO: Disabled due to migrator API changes.
+#    if check_schema and
+#       Sequel::Migrator.get_current_migration_version(@db) !=
+#       Sequel::Migrator.latest_migration_version(File.join(LIB_DIR, 'migrations'))
+#
+#      raise RuntimeError.new("database schema missing or out of date. Please run `cortex_reaver --migrate`.")
+#    end
   end
 
   def self.setup_cache

data/lib/cortex_reaver/config.rb

@@ -170,21 +170,20 @@ You can also just provide a regex for the path, in which case it is matched dire
           'jquery.js',
           'jquery.color.js',
           'jquery.dimensions.js',
-          'jquery.hotkeys-0.7.9.js',
+          'jquery.hotkeys.js',
           'cookie.js'
         ]
       js.define :last,
         :desc => "An Array of Javascript files to load last, in order.",
         :default => []
 
-
       define :photographs,
         :desc => "Photograph configuration options.",
         :default => Construct.new
       photographs.define :sizes,
         :desc => "What sizes of each photograph to maintain.",
         :default => {
-          :thumbnail => '160x',
+          :thumbnail => '168x',
           :grid => '140x140',
           :small => 'x512',
           :medium => 'x768',

data/lib/cortex_reaver/helper/navigation.rb

@@ -72,7 +72,7 @@ module Ramaze
       # of the class (in which case the page which would contain that instance
       # is highlighted, or a page number. Limit determines how many numeric links
       # to include--use :all to include all pages.
-      def page_nav(klass, index = nil, limit = 17)
+      def page_nav(klass, index = nil, limit = 15)
         # Translate :first, :last into corresponding windows.
         case index
         when :first

data/lib/cortex_reaver/helper/sidebar.rb

@@ -26,13 +26,13 @@ module Ramaze
             end
           end
 
-          if Regexp.new("^#{pattern}$").match request.path_info
+          if Regexp.new("^#{pattern}$").match request.path
             true
           else
             false
           end
         when Regexp
-          if path.match request.path_info
+          if path.match request.path
             true
           else
             false

data/lib/cortex_reaver/model/photograph.rb

@@ -131,16 +131,22 @@ module CortexReaver
 
       # Write appropriate sizes to disk
       sizes.each do |size, geometry|
-        image.change_geometry(geometry) do |width, height|
-          attachment = attachment(size.to_s + '.jpg')
-          image.scale(width, height).write(attachment.local_path)
+        attachment = attachment(size.to_s + '.jpg')
+        
+        if size == :grid
+          resized = image.resize_to_fill(*geometry.split('x').map(&:to_i))
+        else
+          image.change_geometry(geometry) do |width, height|
+            resized = image.scale(width, height)
+          end
         end
+        
+        resized.write attachment.local_path
       end
         
-      # Yep, GC time. Gotta clear out those imagemagick stubs.
-      GC.start
-
       # Free IM stubs
+      image = nil
+      resized = nil
       GC.start
 
       true

data/lib/cortex_reaver/public/css/actions.css

@@ -18,24 +18,17 @@ ul.actions {
   display: inline-block;
 }
 
-#top .sections.actions li {
-  padding-bottom: 3px;
-  border-bottom: 3px solid transparent;
-  position: relative;
-  top: 3px;
-}
-
 #top .sections.actions a {
-  padding: 6px;
-  color: #000;
+  padding: 4px 8px;
+  border-radius: 4px;
 }
 
-#top .sections.actions li:hover {
-  border-bottom-color: #444 !important;
+#top .sections.actions a:hover {
+  background: rgba(0,0,0,0.5);
 }
 
-#top .sections.actions li.current {
-  border-bottom-color: #888;
+#top .sections.actions li.current a {
+  background: rgba(0,0,0,0.5);
 }
 
 /* Footer actions on journals, pages, etc */

data/lib/cortex_reaver/public/css/fonts.css

@@ -1,6 +1,10 @@
 body {
   font-size: 13px;
-  font-family: sans-serif;
+  font-family: Helvetica, "Helvetica Neue", Arial, sans-serif;
+}
+
+h1, h2, h3 {
+  font-weight: normal;
 }
 
 h1 {

data/lib/cortex_reaver/public/css/generics.css

@@ -3,7 +3,8 @@ img {
   margin: 0;
 }
 
-a {
+a[href] {
+  color: #213EAD;
   text-decoration: none;
 }
 

data/lib/cortex_reaver/public/css/main.css

@@ -1,41 +1,49 @@
 body {
-  background: #fff;
+  background-color: #171A1F;
+  background-position: top center; 
   color: #000;
   margin: 0;
+  width: 100%;
+  height: 100%;
 }
 
 #content {
-  width: 900px;
+  width: 860px;
   position: relative;
   margin: auto;
 }
 
 #top {
   position: absolute;
-  height: 80px;
-  width: 900px;
+  top: 0px;
+  height: 280px;
+  width: 860px;
   left: 0px;
-  border-bottom: 1px solid #aaa;
+  background: url('/images/header.jpg');
+  -webkit-box-shadow: 0 0 10px rgba(0,0,0,0.7);
+  -moz-box-shadow: 0 0 10px rgba(0,0,0,0.7);
 }
 
 #top h1 {
   padding: 0;
   margin: 0;
-  font-size: 48px;
-  font-weight: 700;
+  font-size: 40px;
   position: absolute;
-  left: 0;
-  bottom: 0;
+  left: 14px;
+  bottom: 10px;
+  text-shadow: rgba(0,0,0,1) 0 0 10px !important;
 }
 
 #top .actions {
   position: absolute;
-  right: 0;
-  bottom: 0;
+  right: 8px;
+  bottom: 14px;
+  text-transform: lowercase;
 }
 
 #top a {
-  color: #000;
+  color: #fff !important;
+  text-shadow: rgba(0,0,0,1) 0 0 4px;
 }
 #top a:hover {
   text-decoration: none;
@@ -43,19 +51,24 @@ body {
 
 #boxes {
   position: absolute;
-  width: 170px;
-  top: 100px;
-  right: 0;
+  width: 168px;
+  top: 290px;
+  right: 12px;
+  z-index: 2;
 }
 
 #main-container {
   position: absolute;
   left: 0px;
-  top: 100px;
-  right: 196px;
+  right: 0px;
+  top: 280px;
+  -webkit-box-shadow: 0 0 10px rgba(0,0,0,0.7);
+  -moz-box-shadow: 0 0 10px rgba(0,0,0,0.7);
+  background: #fff;
 }
 
 #main {
-  background: #fff;
   min-height: 260px;
+  margin: 12px 196px 12px 12px;
+  color: #171A1F;
 }

data/lib/cortex_reaver/public/css/pagination.css

@@ -8,7 +8,7 @@
   margin: 1px;
   padding: 0;
   width: 35px;
-  background: #ddd;
+  background: #CCD3DE;
   display: inline-block;
   color: #000;
 }
@@ -43,7 +43,7 @@
 }
 
 .pagination.actions li:hover, .pagination.actions li.current > *:hover {
-  background: #444;
+  background: #171A1F;
 }
 
 .pagination.actions li > *:hover {
@@ -51,7 +51,7 @@
 }
 
 .pagination.actions li.current {
-  background-color: #888;
+  background-color: #98A2B5;
 }
 
 

data/lib/cortex_reaver/public/css/photo-show.css

@@ -5,6 +5,10 @@
   margin-left: auto;
   margin-right: auto;
   border: none;
+  background: transparent;
+  -moz-box-shadow: none;
+  -webkit-box-shadow: none;
+  box-shadow: none;
 }
 
 #top.photograph a {

data/lib/cortex_reaver/public/css/photo.css

@@ -7,26 +7,20 @@ body.blank {
 .photographs.grid {
   margin: 10px -5px;
   padding: 0;
+  list-style-type: none;
 }
 
 .photographs.grid .thumb {
   display: block;
   float: left;
-  margin: 5px;
+  margin: 10px;
 }
 
 .photographs.grid .thumb > a {
-  width: 166px;
-  height: 166px;
+  width: 140px;
+  height: 140px;
   display: table-cell;
   vertical-align: middle;
-  background-color: #f0f0f0;
-  border-width: 1px;
-  border-style: solid;
-  border-color: #fff #ccc #aaa #ccc;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  border-radius: 4px;
   -webkit-box-shadow: 0px 1px 8px rgba(0,0,0,0.3);
   -moz-box-shadow: 0px 1px 8px rgba(0,0,0,0.3);
   box-shadow: 0px 1px 8px rgba(0,0,0,0.3);

data/lib/cortex_reaver/public/css/sidebar.css

@@ -38,9 +38,8 @@
 
 .box .photo {
   background: #fff;
-  padding: 3px;
-  margin: 0px 2px 10px 2px;
-  -webkit-box-shadow: 0px 0px 3px #000;
-  -moz-box-shadow: 0px 0px 3px #000;
-  box-shadow: 0px 0px 3px #000;
+  margin: 0 0 14px 0;
+  -webkit-box-shadow: 0px 0px 3px rgba(0,0,0,0.7);
+  -moz-box-shadow: 0px 0px 3px rgba(0,0,0,0.7);
+  box-shadow: 0px 0px 3px rgba(0,0,0,0.7);
 }

data/lib/cortex_reaver/public/css/text.css

@@ -1,5 +1,5 @@
 h1 a, h2 a, h3 a {
-  color: #202020;
+  color: inherit !important;
 }
 
 #main {
@@ -42,3 +42,7 @@ h1 a, h2 a, h3 a {
 .text-entry .byline {
   margin-bottom: 2em;
 }
+
+img.attachment {
+  width: 100%;
+}

data/lib/cortex_reaver/public/js/admin.js

@@ -3,27 +3,31 @@ $(document).ready(function() {
   if(Cookie.get('adminboxopen') == 'true') {
     $('.admin.bar').show();
   }
-});
 
-$(document).bind('keydown', {combi:'Alt+Ctrl+a',}, function() {
-  // Toggle admin tools
-  var a = $('.admin.bar');
-  a.slideToggle('fast', function() {
-    if ($('.admin.bar:visible')) {
-      // Focus tools
-      if ($('#admin_login')) $('#admin_login').focus();
+  function toggle() {
+    // Toggle admin tools
+    var a = $('.admin.bar');
+    a.slideToggle('fast', function() {
+      if ($('.admin.bar:visible')) {
+        // Focus tools
+        if ($('#admin_login')) { $('#admin_login').focus(); }
+      } else {
+        // Unfocus tools
+        if ($('#admin_login')) { $('#admin_login').blur(); }
+      }
+    });
+    return true;
+  }
+
+  $(document).bind('keydown', 'alt+ctrl+a', toggle);
+  $('.admin.bar input').bind('keydown', 'alt+ctrl+a', toggle);
+
+  // On leaving the page, remember the admin tool state.
+  $(window).unload(function() {
+    if($('.admin.bar').is(':visible')) {
+      Cookie.set('adminboxopen', 'true', 14);
     } else {
-      // Unfocus tools
-      if ($('#admin_login')) $('#admin_login').blur();
+      Cookie.erase('adminboxopen');
     }
   });
 });
-
-// On leaving the page, remember the admin tool state.
-$(window).unload(function() {
-  if($('.admin.bar').is(':visible')) {
-    Cookie.set('adminboxopen', 'true', 14);
-  } else {
-    Cookie.erase('adminboxopen');
-  }
-});

data/lib/cortex_reaver/public/js/autotags.js

@@ -22,7 +22,7 @@
       comma: 188
     };
 
-    if (settings) $.extend(config, settings);
+    if (settings) { $.extend(config, settings); }
 
     return this.each(function () {
       // MEAT AND POTATOES AND FUNCTIONS (MINUS THE COMESTIBLES)
@@ -36,7 +36,7 @@
         $(node).find('a').click(function() {
           $(node).remove();
           saveTags();
-        })
+        });
 
         // Add to the list.
         $list.append(node);
@@ -74,7 +74,7 @@
       $container.after('<div style="clear: both"></div>');
 
       // Add tags from the original field's contents.
-      if ($.trim($field.val()) != '') {
+      if ($.trim($field.val()) !== '') {
         $.each($field.val().split(','), function(i, tag) { 
           addTag($.trim(tag));
         });
@@ -97,7 +97,7 @@
       $input.keydown(function(e, code) {
         code = code || e.keyCode;
         if (code == keys['return'] || code == 188 || code == keys.tab) {
-          if ($input.val() != '') {
+          if ($input.val() !== '') {
             // Accept new tag
             var newTag = $input.val();
             $input.val('');
@@ -107,7 +107,7 @@
             // Don't submit/leave/add a comma!
             return false;
           }
-        } else if (code == keys.backspace && $input.val() == '') {
+        } else if (code == keys.backspace && $input.val() === '') {
           // Remove the previous tag
           $list.find("li:last").remove();
           saveTags();