caboose-cms 0.1.78 → 0.1.91

data/app/assets/javascripts/caboose/station.js

@@ -43,7 +43,10 @@ CabooseStation = Class.extend({
         this2.open_tabs[this2.open_tabs.length] = id;
       });
       
-      $('#caboose_conductor').click(function() { this2.right(); });  
+      $('#caboose_conductor').click(function(event) { 
+        event.preventDefault();
+        this2.right(); 
+      });  
       $('#caboose_station ul.hidden').hide();
       $('#caboose_station li a.top_level').click(function() {
         ul = $(this).parent().children("ul.hidden:first");
@@ -78,6 +81,11 @@ CabooseStation = Class.extend({
         else if (this2.state == 'right')
           this2.min();
       });
+      
+      $('#caboose_station li.my_account a').click(function(event) {
+        event.preventDefault();
+        this2.open_url($(this).attr('href'));
+      });
     },
     
     min: function(func_after)
@@ -126,7 +134,7 @@ CabooseStation = Class.extend({
     },
     
     open_url: function(url)
-    {      
+    {
       // Send the station settings first
       var this2 = this;
       $.ajax({

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

@@ -9,7 +9,8 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require modeljs
- *= require caboose/caboose 
+ *= require caboose/fonts
+ *= require caboose/caboose  
  */
 
 body {

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

@@ -9,6 +9,7 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require modeljs
- *= require caboose/caboose
+ *= require caboose/fonts
+ *= require caboose/caboose 
  *= require application
  */

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

@@ -62,20 +62,43 @@ body {
   height: 100%;
   background: #e1e1e1;
   border: #aaa 1px solid;
+  font-family: BigNoodleTitling, Tahoma; 
 }
 
-#caboose_station h2 {
-  height: 86px;
+#caboose_station .caboose_logo {
+  height: 100px;
   background-image: url('/assets/caboose/caboose_nav.png');
-  background-position: 0 -33px;
+  background-position: 64px 0;
   margin: 0;
   padding: 0;
   border-bottom: #aaa 1px solid;
+}
+
+#caboose_station h2 {
+  display: none;
+  height: 40px;
+  background-image: url('/assets/caboose/caboose_nav.png');
+  background-position: 64px 0;
+  margin: 0;
+  padding: 80px 0 0 0;
+  border-bottom: #aaa 1px solid;
   
   /* Hide the text. */
+  /*
   text-indent: 100%;
   white-space: nowrap;
   overflow: hidden;
+  */
+}
+
+#caboose_station h2 span {
+  display: block;
+  color: #941403;
+  text-align: center;
+  font-size: 20px;
+  font-weight: normal;
+  background: #e1e1e1;
+  height: 40px;
 }
 
 #caboose_station ul.account {
@@ -99,21 +122,27 @@ body {
   margin: 0;
   padding: 0;
   height: 33px;
-  background-image: url(/assets/caboose/caboose_nav.png);
-  background-repeat: no-repeat;
-  background-position: 0 0;
-  
+ 
   /* Hide the text. */
+  /*
   text-indent: 100%;
   white-space: nowrap;
   overflow: hidden;
+  */
+  font-family: BigNoodleTitling, Tahoma;
+  font-size: 16px;
+  color: #505050;
+  background: #aaa;
+  text-decoration: none;
+  text-align: center;
+  border-bottom: #cecece 1px solid;
+}
+#caboose_station ul.account li a span {
+  padding-top: 8px;
 }
 
-#caboose_station ul.account li.my_account a { width: 103px; background-position:    0px 0px; border-right: #828181 1px solid; }
-#caboose_station ul.account li.logout     a { width: 103px; background-position: -106px 0px; border-left:  #cecece 1px solid; }
-
-#caboose_station ul.account li.my_account a:hover { background-position: -212px 0px; }
-#caboose_station ul.account li.logout     a:hover { background-position: -318px 0px; }
+#caboose_station ul.account li.my_account a { width: 103px; border-right: #828181 1px solid; }
+#caboose_station ul.account li.logout     a { width: 103px; border-left:  #cecece 1px solid; }
 
 #caboose_station ul.account li a:hover {
   color: #941403;
@@ -138,7 +167,7 @@ body {
 }
 
 #caboose_station ul.admin a {
-  display: block;
+  display: block !important;
   margin: 1px 0 0 0;
   padding: 8px 10px;
   color: #505050;
@@ -149,40 +178,65 @@ body {
   color: #941403;
 }
 
-#caboose_station ul.admin a.top_level {
+#caboose_station ul.admin li a.top_level {
   background-image: url('/assets/caboose/caboose_nav.png');
   background-repeat: no-repeat;
   background-position: 0 0;
+  
   width: 208px;
   height: 50px;
   margin: 0;
   padding: 0;
   border-top: #f7f7f7 1px solid;
   border-bottom: #aaa 1px solid;
+  position: relative;
   
   /* Hide the text. */
+  /*
   text-indent: 100%;
   white-space: nowrap;
   overflow: hidden;
+  */
+  font-family: BigNoodleTitling, Tahoma;
+  font-size: 16px;
 }
 
-#caboose_station ul.admin li#nav_item_users       a.top_level { background-position: 0px -119px; }
-#caboose_station ul.admin li#nav_item_roles       a.top_level { background-position: 0px -171px; }
-#caboose_station ul.admin li#nav_item_permissions a.top_level { background-position: 0px -222px; }
-#caboose_station ul.admin li#nav_item_pages       a.top_level { background-position: 0px -275px; }
-#caboose_station ul.admin li#nav_item_settings    a.top_level { background-position: 0px -328px; }
+#caboose_station ul.admin li a.top_level span {
+  display: block !important;
+  margin: 0 0 0 60px;
+  padding: 16px 0 0 0;
+  height: 34px;
+  background: #e1e1e1;
+  vertical-align: middle;
+  font-family: BigNoodleTitling, Tahoma;
+  font-size: 16px;
+}
+#caboose_station ul.admin li a.top_level:hover  span { color: #941403; }
+#caboose_station ul.admin li a.top_level:active span { color: #941403; }
 
-#caboose_station ul.admin li#nav_item_users       a.top_level:hover { background-position: -212px -119px; }
-#caboose_station ul.admin li#nav_item_roles       a.top_level:hover { background-position: -212px -171px; }
-#caboose_station ul.admin li#nav_item_permissions a.top_level:hover { background-position: -212px -222px; }
-#caboose_station ul.admin li#nav_item_pages       a.top_level:hover { background-position: -212px -275px; }
-#caboose_station ul.admin li#nav_item_settings    a.top_level:hover { background-position: -212px -328px; }
+#caboose_station ul.admin li                      a.top_level { background-position: 0px -350px; }
+#caboose_station ul.admin li#nav_item_users       a.top_level { background-position: 0px -100px; }
+#caboose_station ul.admin li#nav_item_roles       a.top_level { background-position: 0px -150px; }
+#caboose_station ul.admin li#nav_item_permissions a.top_level { background-position: 0px -200px; }
+#caboose_station ul.admin li#nav_item_pages       a.top_level { background-position: 0px -250px; }
+#caboose_station ul.admin li#nav_item_settings    a.top_level { background-position: 0px -300px; }
+#caboose_station ul.admin li#nav_item_star        a.top_level { background-position: 0px -350px; }
 
-#caboose_station ul.admin li#nav_item_users       a.top_level:active { background-position: -424px -119px; }
-#caboose_station ul.admin li#nav_item_roles       a.top_level:active { background-position: -424px -171px; }
-#caboose_station ul.admin li#nav_item_permissions a.top_level:active { background-position: -424px -222px; }
-#caboose_station ul.admin li#nav_item_pages       a.top_level:active { background-position: -424px -275px; }
-#caboose_station ul.admin li#nav_item_settings    a.top_level:active { background-position: -424px -328px; }
+#caboose_station ul.admin li                      a.top_level:hover { background-position: -250px -350px; }
+#caboose_station ul.admin li#nav_item_users       a.top_level:hover { background-position: -250px -100px; }
+#caboose_station ul.admin li#nav_item_roles       a.top_level:hover { background-position: -250px -150px; }
+#caboose_station ul.admin li#nav_item_permissions a.top_level:hover { background-position: -250px -200px; }
+#caboose_station ul.admin li#nav_item_pages       a.top_level:hover { background-position: -250px -250px; }
+#caboose_station ul.admin li#nav_item_settings    a.top_level:hover { background-position: -250px -300px; }
+#caboose_station ul.admin li#nav_item_star        a.top_level:hover { background-position: -250px -350px; }
+
+#caboose_station ul.admin li                      a.top_level:active { background-position: -500px -350px; }
+#caboose_station ul.admin li#nav_item_users       a.top_level:active { background-position: -500px -100px; }
+#caboose_station ul.admin li#nav_item_roles       a.top_level:active { background-position: -500px -150px; }
+#caboose_station ul.admin li#nav_item_permissions a.top_level:active { background-position: -500px -200px; }
+#caboose_station ul.admin li#nav_item_pages       a.top_level:active { background-position: -500px -250px; }
+#caboose_station ul.admin li#nav_item_settings    a.top_level:active { background-position: -500px -300px; }
+#caboose_station ul.admin li#nav_item_star        a.top_level:active { background-position: -500px -350px; }
 
 #caboose_station_wrapper.state_min a.close,
 #caboose_station_wrapper.state_left a.close, 
@@ -192,20 +246,30 @@ body {
   background-repeat: no-repeat;
   background-position: 0 0;
   width: 208px;
-  height: 50px;
+  height: 50px;  
+  font-family: BigNoodleTitling, Tahoma;
+  text-decoration: none;
+}
+
+#caboose_station_wrapper a.close span {
+  display: block;
+  margin: 0 0 0 60px;
+  padding: 16px 0 0 0;
+  height: 34px;
   
-  /* Hide the text. */
-  text-indent: 100%;
-  white-space: nowrap;
-  overflow: hidden;
+  font-family: BigNoodleTitling, Tahoma;
+  font-size: 16px;
 }
+#caboose_station_wrapper a.close        span { background: #e1e1e1; color: #505050; }
+#caboose_station_wrapper a.close:hover  span { background: #e1e1e1; color: #941403; }
+#caboose_station_wrapper a.close:active span { background: #d2d2d2; color: #941403; }
 
-#caboose_station_wrapper.state_left  a.close        { background-position:    0px -422px; }
-#caboose_station_wrapper.state_right a.close        { background-position:    0px -380px; }
-#caboose_station_wrapper.state_min   a.close        { background-position:    0px -380px; }
-#caboose_station_wrapper.state_left  a.close:hover  { background-position: -212px -422px; }
-#caboose_station_wrapper.state_right a.close:hover  { background-position: -212px -380px; }
-#caboose_station_wrapper.state_min   a.close:hover  { background-position: -212px -380px; }
-#caboose_station_wrapper.state_left  a.close:active { background-position: -424px -422px; }
-#caboose_station_wrapper.state_right a.close:active { background-position: -424px -380px; }
-#caboose_station_wrapper.state_min   a.close:active { background-position: -424px -380px; }
+#caboose_station_wrapper.state_left  a.close        { background-position:    0px -450px; }
+#caboose_station_wrapper.state_right a.close        { background-position:    0px -400px; }
+#caboose_station_wrapper.state_min   a.close        { background-position:    0px -400px; }
+#caboose_station_wrapper.state_left  a.close:hover  { background-position: -250px -450px; }
+#caboose_station_wrapper.state_right a.close:hover  { background-position: -250px -400px; }
+#caboose_station_wrapper.state_min   a.close:hover  { background-position: -250px -400px; }
+#caboose_station_wrapper.state_left  a.close:active { background-position: -500px -450px; }
+#caboose_station_wrapper.state_right a.close:active { background-position: -500px -400px; }
+#caboose_station_wrapper.state_min   a.close:active { background-position: -500px -400px; }

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

@@ -0,0 +1,5 @@
+
+@font-face {
+	font-family: 'BigNoodleTitling';
+	src: local('Big Noodle Titling'), url('/assets/caboose/fonts/big_noodle_titling.ttf') format('truetype');
+}

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

@@ -0,0 +1,64 @@
+ 
+<h1>Edit Workout</h1>
+
+<p><select name='day' onchange="window.location='/workouts/'+this.value+'/edit';">
+<% @workouts.each do |w| %>
+  <% 
+  text = "Day #{w.day}" + (w.name.nil? ? "" : " - #{w.name}")
+  selected = w.day == @workout.day ? " selected='true'" : ''
+  %>
+  <option value="<%= w.day %>"<%= selected %>><%= text %></option>
+<% end %>
+</select></p>
+<hr />
+<div id='workout_<%= @workout.id %>_container'></div>
+
+<h2>Sets</h2>        
+<div id='set_listing_container'></div>
+<h2>New Set</h2>
+<div id='set_new_container'></div>
+
+<% content_for :css do %>
+<%= stylesheet_link_tag "workouts", :media => "all" %>
+<% end %>
+<% content_for :js do %>
+<%= javascript_include_tag "model.form.set" %>
+<script type="text/javascript">    
+$(document).ready(function() {
+
+new Controller({
+
+  init: function()
+  {
+    var workout = new Model({
+      name: 'Workout',
+      id: <%= @workout.id %>,
+      attributes: [
+        { name: 'name'            , type: 'text'      , value: <%= raw @workout.name.to_json %> },
+        { name: 'description'     , type: 'textarea'  , value: <%= raw @workout.description.to_json %>, width: 400, height: 200 }
+      ]
+    });
+    
+  var set = new Model({
+    name: 'Set',
+    id: 'new',
+    form: 'Model.Form.Set',
+    post_add: function() { 
+      set.listing();
+      $('#'+set.message).empty();
+    },    
+    listing_url: '/sets/listing?workout_id=<%= @workout.id %>',
+    attributes: [
+      { name: 'workout_id'  , type: 'hidden' , value: <%= @workout.id %> }, 
+      { name: 'category_id' , type: 'select' , value: -1, options_url: '/workouts/category-options' },
+      { name: 'movement_id' , type: 'select' , value: -1, options_url: '/movements/options' },
+      { name: 'qty'         , type: 'text'   , value:  1, show_reminder: false, css: { width: 40, textAlign: 'right' } },
+      { name: 'reps'        , type: 'text'   , value: 10, show_reminder: false, css: { width: 40, textAlign: 'right' } },
+      { name: 'per_unit'    , type: 'text'   , value: '', show_reminder: false, css: { width: 40, textAlign: 'right' } },
+      { name: 'hold_time'   , type: 'text'   , value: '', show_reminder: false, css: { width: 40, textAlign: 'right' } }
+    ]
+  });
+
+});
+</script>
+<% end %>

data/app/views/layouts/caboose/_station.html.erb

@@ -23,15 +23,16 @@ end
     <a href='/login' class='login'>Login</a>
   <% else %>
     <ul class='account'>        
-      <li class='my_account'><a href='/users/<%= @user.id %>/edit'>My Account</a></li>
-      <li class='logout'><a href='/logout'>Logout</a></li>
+      <li class='my_account'><a href='/admin/users/<%= @user.id %>/edit'><span>Account</span></a></li>
+      <li class='logout'><a href='/logout'><span>Logout</span></a></li>
     </ul>
-    <h2>Caboose Station</h2>
+    <div class='caboose_logo'></div>
+    <h2><span>Caboose Station</span></h2>
     <ul class='admin'>
       <% i = 0 %>
       <% @nav.each do |item| %>
         <% id = item['id'].nil? ? i.to_s : item['id'] %>
-        <li id='nav_item_<%= id %>'><a href='#' class='top_level'><%= item['text'] %></a>
+        <li id='nav_item_<%= id %>'><a href='#' class='top_level'><span><%= item['text'] %></span></a>
         <% if (!item['children'].nil? && item['children'].count > 0) %>
           <%
           visible = open_tabs.include?(id) || (!item['show_children_default'].nil? && item['show_children_default'])
@@ -47,7 +48,7 @@ end
         <% i + 1 %>
       <% end %>
     </ul>
-    <a href='<%= return_url %>' class='close'>Close</a>
+    <a href='<%= return_url %>' class='close'><span>Close</span></a>
   <% end %>
 </div>
 </div>

data/bin/caboose

@@ -43,7 +43,7 @@ when 'new'
   
   puts "Creating the new rails app..."
   `rails new #{path} -d=mysql`  
-  helper = CabooseHelper.new(path)  
+  helper = CabooseHelper.new(path, true)
   helper.init_all
   
 when 'init'

data/lib/caboose.rb

@@ -1,7 +1,7 @@
 require "caboose/engine"
 
 module Caboose
-  
+      
   mattr_accessor :salt
   @@salt = "This needs to be changed pronto."
 

data/lib/caboose/engine.rb

@@ -4,7 +4,7 @@ require 'jquery-ui-rails'
 require 'modeljs'
 
 module Caboose
-  
+
   def Caboose.log(message, title = nil)
     if (Rails.logger.nil?)
       puts "\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.1.78'
+  VERSION = '0.1.91'
 end

data/lib/sample_files/layout_default.html.erb

@@ -8,22 +8,16 @@
 <body>
 <div id='wrapper'>
   <div id='header'>
-    <div id='top_nav'>
-      <% if (@user.nil? || @user.id == Caboose::User::LOGGED_OUT_USER_ID) %>
-        <%= link_to "Login", "/login?return_url=#{request.fullpath}", :id => 'caboose_login' %>
-      <% else %>
-        <%= link_to "Control Panel", '#', :id => 'caboose_conductor' %>
-      <% end %>
-    </div>
+    <%= render :partial => 'layouts/caboose/top_nav' %>
   </div>
   <div id='content_wrapper'>
     <div id='content'>
 
-<% if (yield) %>
+<% if (yield && yield.strip.length > 0) %>
 <%= yield %>
 <% elsif (!@page.nil?) %>
 <h1><%= @page.title %></h1>
-<%= @page.content %>  
+<%= raw @page.content %>  
 <% end %>
 
     </div>    

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.1.78
+  version: 0.1.91
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -156,6 +156,9 @@ files:
 - app/assets/stylesheets/caboose/admin.css
 - app/assets/stylesheets/caboose/application.css
 - app/assets/stylesheets/caboose/caboose.css
+- app/assets/stylesheets/caboose/fonts/big_noodle_titling.ttf
+- app/assets/stylesheets/caboose/fonts/big_noodle_titling_oblique.ttf
+- app/assets/stylesheets/caboose/fonts.css
 - app/assets/stylesheets/caboose/tinymce.css
 - app/controllers/caboose/admin_controller.rb
 - app/controllers/caboose/application_controller.rb
@@ -197,6 +200,7 @@ files:
 - app/views/caboose/pages/new.html.erb
 - app/views/caboose/pages/show.html.erb
 - app/views/caboose/pages/sitemap.html.erb
+- app/views/caboose/pages/test.html.erb
 - app/views/caboose/pages/update_pic.html.erb
 - app/views/caboose/pages/update_resume.html.erb
 - app/views/caboose/permissions/edit.html.erb