zen 0.2.5 → 0.2.6

data/lib/zen/package/users/lib/users/view/admin/users/index.xhtml

@@ -48,9 +48,21 @@
                     <?r end ?>
                     
                     <td>#{lang("users.special.status_hash.#{user.status}")}</td>
-                    <td>#{user.created_at}</td>
-                    <td>#{user.updated_at}</td>
-                    <td>#{user.last_login}</td>
+                    <td>#{user.created_at.strftime(session[:user].date_format)}</td>
+                    <td>
+                        #{
+                        if user.updated_at
+                          user.updated_at.strftime(session[:user].date_format)
+                        end
+                        }
+                    </td>
+                    <td>
+                        #{
+                        if user.last_login
+                          user.last_login.strftime(session[:user].date_format)
+                        end
+                        }
+                    </td>
                 </tr>
                 <?r end ?>
             </tbody>

data/lib/zen/package/users/migrations/1304939855_user_settings.rb

@@ -0,0 +1,15 @@
+Sequel.migration do
+
+  up do
+    add_column(:users, :language         , String, :default => 'en')
+    add_column(:users, :frontend_language, String, :default => 'en')
+    add_column(:users, :date_format      , String, :default => '%Y-%m-%d %H:%I:%S') 
+  end
+  
+  down do
+    drop_column(:users, :language)
+    drop_column(:users, :date_format)
+    drop_column(:users, :frontend_language)
+  end
+
+end

data/lib/zen/plugin.rb

@@ -6,8 +6,8 @@ module Zen
   ##
   # Plugins in Zen are quite similar to packages except for a few differences. The biggest
   # difference is that plugins won't update any Ramaze root directories or language
-  # directories. This means that they can't have controllers, models and so on. 
-  # Plugins are useful for supporting multiple markup formats (Markdown, Textile, etc) 
+  # directories. This means that they can't have controllers, models and so on.
+  # Plugins are useful for supporting multiple markup formats (Markdown, Textile, etc)
   # and other small tasks such as replacing Email addresses and so on.
   #
   # ## Creating Plugins
@@ -57,7 +57,7 @@ module Zen
   # ## Registering Plugins
   #
   # Now that the plugin is created it's time to tell Zen it actually is a plugin and not
-  # some random class that doesn't belong somewhere. This can be done by calling 
+  # some random class that doesn't belong somewhere. This can be done by calling
   # Zen::Plugin.add and specifying a block with the details of the plugin. Example:
   #
   #     Zen::Plugin.add do |plugin|
@@ -67,7 +67,7 @@ module Zen
   #       plugin.plugin = MyPlugin
   #     end
   #
-  # The name and plugin setter are the most important. Names should always match the 
+  # The name and plugin setter are the most important. Names should always match the
   # regular expression /[a-z0-9_\-]+/. This is done to ensure names are consistent and
   # easy to remember. It's also used for calling plugins and making sure there are no
   # duplicates.
@@ -89,7 +89,6 @@ module Zen
   # @since  0.2.4
   #
   module Plugin
-
     ##
     # Hash containing all registered plugins. The keys are the names of the plugins and
     # the values are instances of Zen::Plugin::Base.
@@ -104,7 +103,7 @@ module Zen
     #
     # @author Yorick Peterse
     # @since  0.2.4
-    # @raise  [Zen::PluginError] Error raised whenever the plugin already exists or is 
+    # @raise  [Zen::PluginError] Error raised whenever the plugin already exists or is
     # missing a certain setter.
     #
     def self.add
@@ -173,6 +172,5 @@ module Zen
         return ::Zen::Plugin[name].plugin.new(*data, &block).call
       end
     end
-
-  end
-end
+  end # Plugin
+end # Zen

data/lib/zen/public/admin/css/{buttons.css → zen/buttons.css}

@@ -9,9 +9,10 @@
 .button
 {
     border:       1px solid #bbb;
-    float:        left;
+    display:      inline-block;
     margin-right: 10px;
 }
+
     .button a, .button input[type="submit"], .button button
     {
         background:      #ddd;
@@ -23,24 +24,27 @@
         cursor:          pointer;
         display:         block;
         font-size:       13px;
-        font-family:     'Helvetica Neue', Helvetica, Arial,'Liberation Sans',FreeSans,sans-serif;
+        font-family:     'Helvetica Neue', Helvetica, Arial, sans-serif;
         margin:          0px;
         min-width:       80px;
-        padding:         5px;
+        padding:         3px;
         text-decoration: none;
         text-shadow:     1px 1px #fff;
         text-align:      center;
     }
+
     .button a
     {
-        padding:      7px 5px 6px 5px;
+        padding: 5px;
     }
+    
     .button input[type="submit"]
     {
-        padding:      7px 5px;
+        padding: 5px 4px 6px 4px;
     }
+    
     .button a:active, .button input[type="submit"]:active, .button button:active
     {
-        background:   #eee -webkit-gradient(linear, left bottom, left top, from(#eee), to(#ddd));
-        background:   #eee -moz-linear-gradient(bottom, top, #eee, #ddd);
+        background: #eee -webkit-gradient(linear, left bottom, left top, from(#eee), to(#ddd));
+        background: #eee -moz-linear-gradient(bottom, top, #eee, #ddd);
     }

data/lib/zen/public/admin/css/{editor.css → zen/editor.css}

@@ -55,27 +55,32 @@
         /* Individual toolbar buttons */
         .editor_container .editor_toolbar ul li.bold
         {
-            background: url("../images/icons/bold.png") no-repeat 6px 5px;
+            background: url("../../images/zen/icons/bold.png") no-repeat 6px 5px;
         }
 
         .editor_container .editor_toolbar ul li.italic
         {
-            background: url("../images/icons/italic.png") no-repeat 6px 5px;
+            background: url("../../images/zen/icons/italic.png") no-repeat 6px 5px;
         }
 
         .editor_container .editor_toolbar ul li.link
         {
-            background: url("../images/icons/link.png") no-repeat 7px 5px;
+            background: url("../../images/zen/icons/link.png") no-repeat 7px 5px;
         }
 
         .editor_container .editor_toolbar ul li.ul
         {
-            background: url("../images/icons/ul.png") no-repeat 6px 5px;
+            background: url("../../images/zen/icons/ul.png") no-repeat 6px 5px;
         }
 
         .editor_container .editor_toolbar ul li.ol
         {
-            background: url("../images/icons/ol.png") no-repeat 6px 5px;
+            background: url("../../images/zen/icons/ol.png") no-repeat 6px 5px;
+        }
+
+        .editor_container .editor_toolbar ul li.preview
+        {
+            background: url('../../images/zen/icons/preview.png') no-repeat 7px 6px;
         }
 
         .editor_container .editor_toolbar ul li:hover

data/lib/zen/public/admin/css/{forms.css → zen/forms.css}

@@ -14,7 +14,7 @@ form label
 
     form label .error
     {
-        background:   url("../images/icons/error.png") no-repeat center left;
+        background:   url("../../images/zen/icons/error.png") no-repeat center left;
         color:        #eb5e4a;
         display:      block;
         margin-top:   8px;

data/lib/zen/public/admin/css/{general.css → zen/general.css}

@@ -91,10 +91,10 @@ a:hover
     padding:      5px 3px 5px 25px;
 }
 
-.icon_edit   { background: url("../images/icons/edit.png") no-repeat center left;    }
-.icon_delete { background: url("../images/icons/delete.png") no-repeat center left;  }
-.icon_add    { background: url("../images/icons/add.png") no-repeat center left;     }
-.icon_success{ background: url("../images/icons/success.png") no-repeat center left; }
-.icon_error  { background: url("../images/icons/error.png") no-repeat center left;   }
-.icon_info   { background: url("../images/icons/info.png") no-repeat center left;    }
-.icon_view   { background: url("../images/icons/view.png") no-repeat center left;    }
+.icon_edit   { background: url("../images/zen/icons/edit.png") no-repeat center left;    }
+.icon_delete { background: url("../images/zen/icons/delete.png") no-repeat center left;  }
+.icon_add    { background: url("../images/zen/icons/add.png") no-repeat center left;     }
+.icon_success{ background: url("../images/zen/icons/success.png") no-repeat center left; }
+.icon_error  { background: url("../images/zen/icons/error.png") no-repeat center left;   }
+.icon_info   { background: url("../images/zen/icons/info.png") no-repeat center left;    }
+.icon_view   { background: url("../images/zen/icons/view.png") no-repeat center left;    }

data/lib/zen/public/admin/css/{layout.css → zen/layout.css}

@@ -6,6 +6,10 @@
  * @author Yorick Peterse
  * @since  0.1a
  */
+#login
+{
+    margin-top: 50px;
+}
 
 /**
  * Top part of the admin panel that contains the user bar along with the main navigation menu.
@@ -103,11 +107,6 @@
     margin: 20px auto;
     width:  500px;
 }
-
-    #login #container
-    {
-        margin-top: 50px;
-    }
   
 /**
  * Bottom part of the admin panel containing the footer

data/lib/zen/public/admin/css/zen/messages.css

@@ -0,0 +1,61 @@
+@charset "UTF-8";
+
+/**
+ * Stylesheet used for the messages (such as errors) in the backend.
+ *
+ * @author Yorick Peterse
+ * @since  0.2.6
+ */
+#message_container
+{
+    margin-top: 20px;
+}
+
+#login #message_container
+{
+    margin: 20px auto;
+    width:  510px;
+}
+
+    #message_container .message
+    {
+        text-align: center;
+    }
+
+        #message_container .message p
+        {
+            margin-bottom: 10px;
+        }
+
+        #message_container .message p:last-child
+        {
+            margin-bottom: 0px;
+        }
+
+.message
+{
+    padding: 5px 10px;
+}
+
+.message.error
+{
+    background:  #BD132A;
+    border:      1px solid #910F20;
+    color:       #fff;
+    text-shadow: 1px 1px #910F20;
+}
+
+.message.success
+{
+    background:  #ABCC6A;
+    border:      1px solid #758C46;
+    color:       #fff;
+    text-shadow: 1px 1px #758C46;
+}
+
+.message.info
+{
+    background:  #F7D76D;
+    border:      1px solid #F7BB6D;
+    color:       #000;
+}

data/lib/zen/public/admin/css/{notifications.css → zen/notifications.css}

@@ -8,19 +8,19 @@
  */
 #success
 {
-    background: #B3D760 url("../images/icons/success.png") no-repeat 5px center;
+    background: #B3D760 url("../../images/zen/icons/success.png") no-repeat 5px center;
     border:     1px solid #599929;
 }
 
 #error
 {
-    background: #F57E62 url("../images/icons/error.png") no-repeat 5px center;
+    background: #F57E62 url("../../images/zen/icons/error.png") no-repeat 5px center;
     border:     1px solid #FF3100;
 }
 
 #notice
 {
-    background: #FFF58C url("../images/icons/info.png") no-repeat 5px center;
+    background: #FFF58C url("../../images/zen/icons/info.png") no-repeat 5px center;
     border:     1px solid #FFDA05;
 }
 
@@ -55,7 +55,7 @@
 
     .notification .close
     {
-        background: url("../images/icons/close.png") no-repeat center left;
+        background: url("../../images/zen/icons/close.png") no-repeat center left;
         display:    none;
         height:     33px;
         left:       0px;

data/lib/zen/public/admin/css/{tables.css → zen/tables.css}

@@ -36,17 +36,17 @@ table
 
         table thead tr th, table tbody tr td
         {
-            padding:      5px 10px 5px 10px;
+            padding: 4px 10px 2px 10px;
         }
 
         .table thead tr th:first-child, .table tbody tr td:first-child
         {
-            width:        15px;
+            width: 15px;
         }
 
         .table thead tr th:first-child input[type="checkbox"], .table tbody tr td:first-child input[type="checkbox"]
         {
-            margin-top:  3px;
+            margin-top: 3px;
         }
 
     table tr.odd

data/lib/zen/public/admin/css/{tabs.css → zen/tabs.css}

@@ -9,7 +9,7 @@
 .tabs
 {
     border:        1px solid #aaa;
-    height:        40px;
+    height:        30px;
     margin-bottom: 20px;
 }
     .tabs ul
@@ -17,7 +17,7 @@
         background:      #ddd -webkit-gradient(linear, left bottom, left top, from(#ddd), to(#eee));
         background:      #ddd -moz-linear-gradient(bottom, top, #ddd, #eee);
         border-top:      1px solid #fff;
-        height:          39px;
+        height:          29px;
         list-style-type: none;
         margin:          0px;
     }
@@ -40,14 +40,14 @@
             background:        #eee -webkit-gradient(linear, left bottom, left top, from(#eee), to(#ddd));
             background:        #eee -moz-linear-gradient(bottom, top, #eee, #ddd);
             border-bottom:     1px solid #aaa;
-            height:            29px;
+            height:            19px;
         }
             .tabs ul li a
             {
                 color:           #000;
                 display:         block;
-                height:          30px;
-                padding:         10px 15px 0px 15px;
+                height:          20px;
+                padding:         6px 15px 4px 15px;
                 text-decoration: none;
                 text-shadow:     0px 1px #fff;
             }

data/lib/zen/public/admin/css/zen/window.css

@@ -0,0 +1,79 @@
+/**
+ * Stylesheet used for the Javascript class Zen.Window.
+ *
+ * @author Yorick Peterse
+ * @since  0.2.6
+ */
+.window
+{
+    background:     #fff;
+    border:         1px solid #aaa;
+    left:           50%;
+    min-width:      350px;
+    min-height:     100px;
+    position:       absolute;
+    padding-bottom: 10px;
+    top:            80px;
+}
+
+.window.move
+{
+    cursor: move;
+}
+
+.window.resize
+{
+    cursor: nwse-resize;
+}
+
+.window, .window header
+{
+    border-radius:         5px 5px 0px 0px;
+    -webkit-border-radius: 5px 5px 0px 0px;
+    -moz-border-radius:    5px 5px 0px 0px;
+}
+
+    .window header
+    {
+        background:    #ddd -webkit-gradient(linear, left bottom, left top, from(#ddd), to(#eee));
+        background:    #ddd -moz-linear-gradient(bottom, top, #ddd, #eee);
+        border-top:    1px solid #fff;
+        border-bottom: 1px solid #aaa;
+        padding:       3px;
+    }
+
+        .window header h1
+        {
+            font-size:   13px;
+            font-weight: normal;
+            float:       right;
+            margin:      0px;
+            padding:     0px;
+            text-shadow: 0px 1px #fff;
+            text-align:  center;
+            width:       96%;
+        }
+
+        .window header .close
+        {
+            background: url('../../images/zen/icons/close.png') no-repeat center left;
+            cursor:     pointer;
+            float:      left;
+            height:     16px;
+            width:      16px;
+        }
+
+    .window .body, .window .buttons
+    {
+        padding: 10px;
+    }
+
+    .window .buttons
+    {
+        float: right;
+    }
+
+        .window .buttons .button:last-child
+        {
+            margin-right: 0px;
+        }