cortex-reaver 0.2.2 → 0.2.3

data/lib/cortex_reaver/config.rb

@@ -167,6 +167,19 @@ You can also just provide a regex for the path, in which case it is matched dire
           'jquery.hotkeys-0.7.9.js',
           'cookie.js'
         ]
+
+      define :photographs,
+        :desc => "Photograph configuration options.",
+        :default => Construct.new
+      photographs.define :sizes,
+        :desc => "What sizes of each photograph to maintain.",
+        :default => {
+          :thumbnail => '166x',
+          :grid => '150x150',
+          :small => 'x512',
+          :medium => 'x768',
+          :large => 'x1024'
+        }
     end
 
     def compile_views

data/lib/cortex_reaver/controller/admin.rb

@@ -46,6 +46,15 @@ module CortexReaver
             end
           end
 
+          # Photographs
+          c.photographs.sizes = Construct.new
+          request['photographs.sizes'].split("\n").each do |line|
+            parts = line.strip.split(' ', 2)
+            if parts.size > 1
+              c.photographs.sizes[parts.first] = parts.last
+            end
+          end
+
           if errors.empty?
             # Save
             CortexReaver.instance_variable_set '@config', c

data/lib/cortex_reaver/controller/controller.rb

@@ -4,7 +4,7 @@ module CortexReaver
     # trait :app => :cortex_reaver
     engine :Erubis
     layout :text
-    helper :form, :auth, :navigation, :workflow, :error, :sidebar, :aspect
+    helper :form, :auth, :navigation, :workflow, :error, :sidebar, :aspect, :common
   end
 end
 

data/lib/cortex_reaver/helper/common.rb

@@ -0,0 +1,17 @@
+module Ramaze
+  module Helper
+    module Common
+      def flashbox
+        f = ''
+        flash.each do |k, v|
+          f << '<div class="flash ' + k.to_s + '">'
+          f << '<div class="icon"></div>'
+          f << '<div class="body">' + v.to_s + '</div>'
+          f << '<div class="clear"></div>'
+          f << '</div>'
+        end
+        f
+      end
+    end
+  end
+end

data/lib/cortex_reaver/layout/blank.rhtml

@@ -16,7 +16,9 @@
 
     <%= CortexReaver::MainController.render_view('adminbox') %>
 
-    <%= @content %>
+    <div class="container" style="position: relative">
+      <%= @content %>
+    </div>
 
     <%= CortexReaver::MainController.render_view('tracker') %>
 

data/lib/cortex_reaver/model/photograph.rb

@@ -8,15 +8,6 @@ module CortexReaver
     plugin :sequenceable
     plugin :viewable
 
-    # Target image sizes
-    SIZES = {
-      :thumbnail => '166x',
-      :grid => '150x150',
-      :small => 'x512',
-      :medium => 'x768',
-      :large => 'x1024',
-    }
-
     many_to_many :tags, :class => 'CortexReaver::Tag'
     many_to_one :creator, :class => 'CortexReaver::User', :key => 'created_by'
     many_to_one :updater, :class => 'CortexReaver::User', :key => 'updated_by'
@@ -110,10 +101,11 @@ module CortexReaver
 
     # Regenerates various photo sizes.
     def regenerate_sizes
+      sizes = CortexReaver.config.photographs.sizes
       Ramaze::Log.info "Regenerating photo sizes for #{self}"
 
       # Find existing attachments, in order of decreasing (roughly) size
-      known_files = attachments.map{|a| a.name.sub(/\.jpg$/,'')} & (SIZES.keys.map(&:to_s) + ['original'])
+      known_files = attachments.map{|a| a.name.sub(/\.jpg$/,'')} & (sizes.keys.map(&:to_s) + ['original'])
       largest = attachment(
         known_files.sort_by { |f| 
           File.stat(attachment("#{f}.jpg").path).size
@@ -138,12 +130,11 @@ module CortexReaver
       end
 
       # Write appropriate sizes to disk
-      SIZES.each do |size, geometry|
+      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)
         end
-
       end
         
       # Yep, GC time. Gotta clear out those imagemagick stubs.

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

@@ -23,9 +23,10 @@ ul.actions {
 .footer .actions {
   font-size: 80%;
 }
-.footer .actions li:before {
-  content: '|';
+
+.footer .actions li {
+  margin-right: 0.5em;
 }
-.footer .actions li:first-child:before {
-  content: none;
+.footer .actions li:last-child {
+  margin-right: 0;
 }

data/lib/cortex_reaver/public/css/admin.css

@@ -6,6 +6,8 @@
   font-size: 80%;
   text-align: center;
   display: none;
+  -webkit-box-shadow: 0 0px 10px #000;
+  -moz-box-shadow: 0 0px 10px #000;
 }
 
 .admin.bar p {

data/lib/cortex_reaver/public/css/flash.css

@@ -1,17 +1,49 @@
 .flash {
-  width: 700px;
-  padding: 0.5em;
-  margin: 10px;
+  padding: 0;
+  font-size: 14px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  margin-bottom: 10px;
 }
 
-#flash_notice {
-  border: 1px solid #00b;
-  color: #00b;
+.flash .icon {
+  float: left;
+  background-image: url('/images/admin/icons.png');
+  background-repeat: no-repeat;
+  height: 32px;
+  width: 32px;
+  margin: 6px;
+}
+
+.flash .body {
+  margin: 6px;
+  float: left;
+}
+
+.flash.notice {
+  color: #003;
   background: #e6e6ff;
+  -webkit-box-shadow: 0 1px 2px #88a;
+}
+body.photographs .flash.notice {
+  background: #3C3C54;
+  -webkit-box-shadow: none;
+  color: #fff;
+}
+.flash.notice .icon {
+  background-position: -224px -32px;
 }
 
-#flash_error {
-  border: 1px solid #b00;
-  color: #b00;
+.flash.error {
+  color: #300;
   background: #ffe6e6;
+  -webkit-box-shadow: 0 1px 2px #a88;
+}
+body.photographs .flash.error {
+  background: #541C1C;
+  color: #fff;
+  -webkit-box-shadow: none;
+}
+.flash.error .icon {
+  background-position: -256px -32px;
 }

data/lib/cortex_reaver/public/css/form.css

@@ -3,11 +3,16 @@ textarea {
   height: 36em;
 }
 
-p.small textarea {
+.small textarea {
   width: 99%;
   height: 3em;
 }
 
+.medium textarea {
+  width: 99%;
+  height: 10em;
+}
+
 form p {
   clear: both;
 }

data/lib/cortex_reaver/public/css/progress.css

@@ -17,6 +17,10 @@
   color: #fff;
   padding: 2px 4px 2px 0;
   height: 12px;
+  -moz-border-radius-topright: 2px;
+  -moz-border-radius-bottomright: 2px;
+  -webkit-border-top-right-radius: 2px;
+  -webkit-border-bottom-right-radius: 2px;
 }
 
 .progress .percent_bar {

data/lib/cortex_reaver/public/css/tags.css

@@ -4,19 +4,15 @@ ul.tags {
   padding: 0px;
   background: url(/images/tag.gif) no-repeat;
   background-position: 0px 3px;
-  padding-left: 12px;
+  padding-left: 14px;
 }
 
 .tags li {
   display: inline;
+  margin-right: 0.5em;
 }
-
-.tags li:before {
-  content: ',  '
-}
-
-.tags li:first-child:before {
-  content: none;
+.tags li:last-child {
+  margin-right: 0;
 }
 
 /* Global tags display */

data/lib/cortex_reaver/version.rb

@@ -1,6 +1,6 @@
 module CortexReaver
   APP_NAME = 'Cortex Reaver'
-  APP_VERSION = '0.2.2'
+  APP_VERSION = '0.2.3'
   APP_AUTHOR = 'Kyle Kingsbury'
   APP_EMAIL = 'aphyr@aphyr.com'
   APP_URL = 'http://aphyr.com'

data/lib/cortex_reaver/view/admin/configuration.rhtml

@@ -11,7 +11,10 @@
   <%= form_p 'site.description', :type => :textarea, :description => 'Description', :default => @config.site.description, :p_class => 'small' %>
 
   <h3>Navigation</h3>
-  <%= form_p 'view.sections', :type => :textarea, :description => @config.view.schema[:sections][:desc], :default => @config.view.sections.map{ |p| p.join(' ') }.join("\n") %>
+  <%= form_p 'view.sections', :type => :textarea, :description => @config.view.schema[:sections][:desc], :default => @config.view.sections.map{ |p| p.join(' ') }.join("\n"), :p_class => 'medium' %>
+
+  <h3>Photographs</h3>
+  <%= form_p 'photographs.sizes', :type => :textarea, :description => @config.photographs.schema[:sizes][:desc], :default => @config.photographs.sizes.map { |p| p.join(' ') }.join("\n"), :p_class => 'medium' %>
 
   <input type="submit" value="Update Configuration" />
 </form>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cortex-reaver
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Kyle Kingsbury
@@ -100,7 +100,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.1.2
+        version: 0.1.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: rmagick
@@ -320,6 +320,7 @@ files:
 - lib/cortex_reaver/helper/tags.rb
 - lib/cortex_reaver/helper/auth.rb
 - lib/cortex_reaver/helper/form.rb
+- lib/cortex_reaver/helper/common.rb
 - lib/cortex_reaver/helper/activity.rb
 - lib/cortex_reaver/helper/date.rb
 - lib/cortex_reaver/helper/error.rb