zen 0.4.2 → 0.4.3

data/lib/zen/package/users/lib/users/helper/access.rb

@@ -67,7 +67,7 @@ module Ramaze
         ##
         # Called whenever the class that included this module is extended.
         #
-        # @since 07-11-2011
+        # @since 2011-11-07
         # @param [Class] by The class that extended the current class.
         #
         def inherited(by)

data/lib/zen/package/users/lib/users/helper/acl.rb

@@ -5,8 +5,8 @@ module Ramaze
     # certain resources based on the permissions of a user. This helper is
     # loaded by default and provides the following two methods:
     #
-    # * user_authorized?()
-    # * authorize_user!()
+    # * user\_authorized?()
+    # * authorize\_user!()
     #
     # ## Example
     #
@@ -37,7 +37,7 @@ module Ramaze
       #  end
       #
       # @since  0.1
-      # @param  [Array] *required An array of permissions that are required.
+      # @param  [Array] required An array of permissions that are required.
       # @return [TrueClass|FalseClass]
       #
       def user_authorized?(*required)
@@ -63,7 +63,7 @@ module Ramaze
       #  authorize_user!(:edit_user)
       #
       # @since  0.2.8
-      # @param  [Array] *args An array of permissions that are required.
+      # @param  [Array] args An array of permissions that are required.
       #
       def authorize_user!(*args)
         if !user_authorized?(*args)

data/lib/zen/package/users/lib/users/helper/users.rb

@@ -92,7 +92,7 @@ module Ramaze
       # informing the current user that the user he/she tried to access is
       # invalid.
       #
-      # @since 09-04-2012
+      # @since 2012-04-09
       #
       def redirect_invalid_user
         message(:error, lang('users.errors.invalid_user'))
@@ -103,7 +103,7 @@ module Ramaze
       # Redirects the user back to the user groups overview and informs the user
       # that the group he/she tried to access is invalid.
       #
-      # @since 09-04-2012
+      # @since 2012-04-09
       #
       def redirect_invalid_user_group
         message(:error, lang('user_groups.errors.invalid_group'))

data/lib/zen/package/users/lib/users/model/permission.rb

@@ -29,7 +29,7 @@ module Users
       ##
       # Hook that is executed before creating or saving an object.
       #
-      # @since 03-01-2012
+      # @since 2012-01-03
       #
       def before_save
         sanitize_fields([:permission])

data/lib/zen/package/users/lib/users/model/user.rb

@@ -14,12 +14,12 @@ module Users
     #  end
     #
     # @since 0.1
-    # @event before_new_user
-    # @event after_new_user
-    # @event before_edit_user
-    # @event after_edit_user
-    # @event before_delete_user
-    # @event after_delete_user
+    # @event before\_new\_user
+    # @event after\_new\_user
+    # @event before\_edit\_user
+    # @event after\_edit\_user
+    # @event before\_delete\_user
+    # @event after\_delete\_user
     #
     class User < Sequel::Model
       ##
@@ -32,7 +32,7 @@ module Users
       ##
       # Array containing the columns that can be set by the user.
       #
-      # @since 17-02-2012
+      # @since 2012-02-17
       #
       COLUMNS = [
         :email,
@@ -70,7 +70,7 @@ module Users
       ##
       # Searches for a set of users that match the given query.
       #
-      # @since  16-10-2011
+      # @since  2011-10-16
       # @param  [String] query The search query.
       # @return [Mixed]
       #
@@ -183,7 +183,7 @@ module Users
       # Gets the name of the user's status and returns it in the current
       # language.
       #
-      # @since  03-11-2011
+      # @since  2011-11-03
       # @return [String]
       #
       def user_status_name
@@ -193,7 +193,7 @@ module Users
       ##
       # Activates the user.
       #
-      # @since 03-11-2011
+      # @since 2011-11-03
       #
       def activate!
         update(
@@ -204,7 +204,7 @@ module Users
       ##
       # Closes the user account.
       #
-      # @since 03-11-2011
+      # @since 2011-11-03
       #
       def close!
         update(

data/lib/zen/package/users/lib/users/model/user_group.rb

@@ -5,12 +5,12 @@ module Users
     # Model that represents a single user group.
     #
     # @since 0.1
-    # @event before_new_user_group
-    # @event after_new_user_user
-    # @event before_edit_user_group
-    # @event after_edit_user_group
-    # @event before_delete_user_group
-    # @event after_delete_user_group
+    # @event before\_new\_user\_group
+    # @event after\_new\_user\_user
+    # @event before\_edit\_user\_group
+    # @event after\_edit\_user\_group
+    # @event before\_delete\_user\_group
+    # @event after\_delete\_user\_group
     #
     class UserGroup < Sequel::Model
       include Zen::Model::Helper
@@ -18,7 +18,7 @@ module Users
       ##
       # Array containing the columns that can be set by the user.
       #
-      # @since 17-02-2012
+      # @since 2012-02-17
       #
       COLUMNS = [:name, :slug, :description, :super_group]
 
@@ -42,7 +42,7 @@ module Users
       ##
       # Searches for a set of users that match the given query.
       #
-      # @since  16-10-2011
+      # @since  2011-10-16
       # @param  [String] query The search query.
       # @return [Mixed]
       #
@@ -67,7 +67,7 @@ module Users
       ##
       # Hook that is executed before creating or saving an object.
       #
-      # @since 03-01-2012
+      # @since 2012-01-03
       #
       def before_save
         sanitize_fields([:name, :slug, :description])

data/lib/zen/package/users/lib/users/model/user_status.rb

@@ -3,7 +3,7 @@ module Users
     ##
     # Model used for user statuses such as "Open" and "Unconfirmed".
     #
-    # @since 03-11-2011
+    # @since 2011-11-03
     #
     class UserStatus < Sequel::Model
       one_to_many :users, :class => 'Users::Model::User'
@@ -14,7 +14,7 @@ module Users
       # Returns a hash where the keys are the IDs of the various statuses and
       # the values the translations.
       #
-      # @since  03-11-2011
+      # @since  2011-11-03
       # @return [Hash]
       #
       def self.dropdown

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

@@ -162,6 +162,11 @@ pre
     background-image: url('/admin/zen/images/icons/error.png');
 }
 
+.icon.undo
+{
+    background-image: url('/admin/zen/images/icons/undo.png');
+}
+
 .label
 {
     color:   #fff;
@@ -186,3 +191,52 @@ pre
 {
     background: #f7c052;
 }
+
+/* Styles for diffs. These styles are based on the ones used by Github. */
+.diff
+{
+    border:      1px solid #ccc;
+    font-family: monospace;
+    font-size:   12px;
+    overflow-x:  auto;
+    width:       800px;
+}
+
+    .diff table
+    {
+        margin: 0px;
+    }
+
+        .diff table tbody tr td
+        {
+            border:  none;
+            padding: 0px;
+        }
+
+    .diff .line_number
+    {
+        background:    #eee;
+        border-right:  1px solid #ccc;
+        color:         #666;
+        padding:       2px 5px;
+        text-align:    right;
+        width:         20px;
+    }
+
+    .diff .line
+    {
+        padding:      2px 2px 2px 5px;
+        white-space:  pre;
+    }
+
+    .diff .ins
+    {
+        background: #dfd;
+        color:      #080;
+    }
+
+    .diff .del
+    {
+        background: #fee;
+        color:      #b00;
+    }

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

@@ -25,11 +25,14 @@
 
 .message.success
 {
-    background: #ABCC6A;
+    background:  #ABCC6A;
+    color:       #000;
+    text-shadow: 1px 1px #D6F59A;
 }
 
 .message.info
 {
-    background: #F7D76D;
-    color:      #000;
+    background:  #F7D76D;
+    color:       #000;
+    text-shadow: 1px 1px #FAE9B1;
 }

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

@@ -51,6 +51,11 @@ table
         background: #f9f9f9;
     }
 
+    table .narrow
+    {
+        width: 25px!important;
+    }
+
 .datepicker tr:nth-child(odd) td
 {
     background: #fff;
@@ -88,3 +93,8 @@ table
     background:      #eee;
     text-decoration: none;
 }
+
+table.no_background tbody td, table.no_background thead th
+{
+    background: none;
+}

data/lib/zen/public/admin/zen/js/lib/autosave.js

@@ -37,7 +37,7 @@ namespace('Zen');
  * If the field with this name has a non empty value then the form will be
  * submitted at a given interval, otherwise it will be ignored.
  *
- * @since 15-02-2012
+ * @since 2012-02-15
  */
 Zen.Autosave = new Class(
 {
@@ -46,21 +46,21 @@ Zen.Autosave = new Class(
     /**
      * Element containing the form element.
      *
-     * @since 16-02-2012
+     * @since 2012-02-16
      */
     element: null,
 
     /**
      * The URL to submit the data to.
      *
-     * @since 16-02-2012
+     * @since 2012-02-16
      */
     url: null,
 
     /**
      * Object containing various options to customize the auto saving behaviour.
      *
-     * @since 16-02-2012
+     * @since 2012-02-16
      */
     options:
     {
@@ -77,7 +77,7 @@ Zen.Autosave = new Class(
     /**
      * Creates a new instance of the class.
      *
-     * @since 16-02-2012
+     * @since 2012-02-16
      * @param {Element} element The form element to submit.
      * @param {String} url The URL to submit the data to.
      * @param {Object} options Object containing custom options. See
@@ -112,7 +112,7 @@ Zen.Autosave = new Class(
      * Submits the form data to the server. Upon success the CSRF token is
      * updated, upon failure the validation errors will be displayed.
      *
-     * @since 16-02-2012
+     * @since 2012-02-16
      */
     sendRequest: function()
     {
@@ -141,7 +141,7 @@ Zen.Autosave = new Class(
     /**
      * Displays the validation errors of a set of fields.
      *
-     * @since 16-02-2012
+     * @since 2012-02-16
      * @param {Object} form_errors Object containing the form errors. The keys
      *  should be the names of the fields and the values arrays of error messages
      *  to display.
@@ -175,7 +175,7 @@ Zen.Autosave = new Class(
     /**
      * Updates the CSRF token with the given value.
      *
-     * @since 16-02-2012
+     * @since 2012-02-16
      * @param {String} token The new CSRF token.
      */
     setToken: function(token)

data/lib/zen/public/admin/zen/js/lib/base.js

@@ -20,7 +20,7 @@
  *
  *  Zen.Editor.Markdown = new Class(...);
  *
- * @since 22-12-2011
+ * @since 2011-12-22
  * @param {string} name The namespace to create.
  */
 function namespace(name)
@@ -45,7 +45,7 @@ function namespace(name)
  *
  *     var string = Zen.translations['foo.bar'];
  *
- * @since  22-12-2011
+ * @since  2011-12-22
  * @param  {string} key The language key to retrieve.
  * @return {string}
  */

data/lib/zen/public/admin/zen/js/lib/events.js

@@ -13,7 +13,7 @@
  * Do note that this implementation does not offer any backwards compatibility
  * with browsers that don't natively support ``window.onhashchange``.
  *
- * @since 21-12-2011
+ * @since 2011-12-21
  */
 Element.Events.hashchange = {
     onAdd: function()
@@ -30,7 +30,7 @@ Element.Events.hashchange = {
 /**
  * Adds support for the "invalid" event that is raised for invalid form fields.
  *
- * @since 10-03-2012
+ * @since 2012-03-10
  */
 Element.Events.invalid = {
     onAdd: function()

data/lib/zen/public/admin/zen/js/lib/form.js

@@ -48,7 +48,7 @@ namespace('Zen');
  *         <!-- Tab field's content -->
  *     </div>
  *
- * @since 12-03-2012
+ * @since 2012-03-12
  */
 Zen.Form = new Class(
 {
@@ -57,14 +57,14 @@ Zen.Form = new Class(
     /**
      * The form element for this class.
      *
-     * @since 12-03-2012
+     * @since 2012-03-12
      */
     element: null,
 
     /**
      * Object containing the default and custom defined options merged together.
      *
-     * @since 12-03-2012
+     * @since 2012-03-12
      */
     options:
     {
@@ -83,7 +83,7 @@ Zen.Form = new Class(
     /**
      * Creates and prepares a new instance of the class.
      *
-     * @since 12-03-2012
+     * @since 2012-03-12
      * @param {Element} element The form element to use for the instance of this
      *  class.
      * @param {Object} options An object containing custom options to use for
@@ -152,7 +152,7 @@ Zen.Form = new Class(
      * element is invalid a small icon indicating that there is invalid data
      * will be displayed in the tab the field belongs to.
      *
-     * @since 12-03-2012
+     * @since 2012-03-12
      * @param {Element} element The invalid form element.
      */
     invalidElement: function(element)
@@ -179,7 +179,7 @@ Zen.Form = new Class(
      * used to check if all the errors in a tab field are gone and if so will
      * remove the error indicator.
      *
-     * @since 12-03-2012
+     * @since 2012-03-12
      * @param {Element} element The form element that lost focus.
      */
     blurElement: function(element)
@@ -209,7 +209,7 @@ Zen.Form = new Class(
      * Given a form element (or any other kind of element in a form) this method
      * will try to retrieve the tab field the element belongs to.
      *
-     * @since  12-03-2012
+     * @since  2012-03-12
      * @param  {Element} element The element for which to retrieve the tab
      *  field.
      * @return {Element|null}