radiant 0.9.1 → 1.0.0.rc1

data/config/initializers/radiant_config.rb

@@ -0,0 +1,17 @@
+Radiant.config do |config|
+  config.define 'admin.title', :default => "Radiant CMS"
+  config.define 'dev.host'
+  config.define 'local.timezone', :allow_change => true, :select_from => lambda { ActiveSupport::TimeZone::MAPPING.keys.sort }
+  config.define 'defaults.locale', :select_from => lambda { Radiant::AvailableLocales.locales }, :allow_blank => true
+  config.define 'defaults.page.parts', :default => "Body,Extended"
+  config.define 'defaults.page.status', :select_from => lambda { Status.selectable_values }, :allow_blank => true, :default => "Draft"
+  config.define 'defaults.page.filter', :select_from => lambda { TextFilter.descendants.map { |s| s.filter_name }.sort }, :allow_blank => true
+  config.define 'defaults.page.fields'
+  config.define 'defaults.snippet.filter', :select_from => lambda { TextFilter.descendants.map { |s| s.filter_name }.sort }, :allow_blank => true
+  config.define 'pagination.param_name', :default => 'page'
+  config.define 'pagination.per_page_param_name', :default => 'per_page'
+  config.define 'admin.pagination.per_page', :type => :integer, :default => 50
+  config.define 'site.title', :default => "Your site title", :allow_blank => false
+  config.define 'site.host', :default => "www.example.com", :allow_blank => false
+  config.define 'user.allow_password_reset?', :default => true
+end 

data/config/locales/en.yml

@@ -7,9 +7,11 @@ en:
         blank: 'this must not be blank' # required
         invalid: 'this does not match the expected format' #invalid_format
         not_a_number: 'this must be a number' # must be number
+        not_a_page: "there must be a page at this address"
+        not_permitted: 'this must be one of the permitted values'
         taken: 'this name is already in use' # name_in_use
-        too_long: 'this must not be longer than {{count}} characters' # character_limit
-        too_short: 'this must be at least {{count}} characters long' # character_minimum
+        too_long: 'this must not be longer than %{count} characters' # character_limit
+        too_short: 'this must be at least %{count} characters long' # character_minimum
       models:
         page:
           attributes:
@@ -24,23 +26,45 @@ en:
             password:
               confirmation: 'this must match confirmation' # password_confirmation
   add_child: 'Add Child'
+  add_field: 'Add Field'
   add_part: 'Add Part'
   add_tab: 'Add Tab'
   admin: 'Administrator' 
   available_tags: 'Available Tags'
-  available_tags_for: 'Available Tags for {{name}}'
+  available_tags_for: 'Available Tags for %{name}'
   body: 'Body'  
   breadcrumb: 'Breadcrumb'
   buttons:
-    create: 'Create {{name}}'   
+    create: 'Create %{name}'
     save_and_continue: 'Save and Continue Editing'
     save_changes: 'Save Changes'  
   cancel: 'Cancel'
   change: 'Change'
   close: 'Close'
+  config:
+    admin:
+      title: 'admin header title'
+    defaults:
+      locale: 'default language'
+      page:
+        fields: "page fields"
+        filter: "page filter"
+        parts: "page parts"
+        status: "page status"
+      snippet:
+        filter: "snippet filter"
+    dev:
+      host: "dev site domain name"
+    local:
+      timezone: "local timezone"
+    site:
+      title: "site title"
+      host: "site domain"
+    user:
+      allow_password_reset?: "allow password reset"
   content: 'Content'
   content_type: 'Content‑Type'    
-  creating_status: 'Creating {{model}}…'
+  creating_status: 'Creating %{model}…'
   date:
     abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
     abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
@@ -53,15 +77,19 @@ en:
     month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]   
     order: [ :year, :month, :day ]
   delete_layout: 'Delete Layout'
-  delete_pages: 'Delete {{pages}}'  
+  delete_pages: 'Delete %{pages}'
   delete_snippet: 'Delete Snippet'
   delete_user: 'Delete User'
   description: 'Description'
   design: 'Design'
   designer: 'Designer'
   draft: 'Draft'
+  edit: 'Edit'
+  edit_configuration: 'Edit Configuration'
   edit_layout: 'Edit Layout'
   edit_page:  'Edit Page'   
+  edit_preferences: 'Edit Preferences'
+  edit_settings: 'Edit Settings'
   edit_snippet: 'Edit Snippet'
   edit_user: 'Edit User'
   email_address: 'E-mail Address'
@@ -77,8 +105,9 @@ en:
   log_out: 'Logout'
   logged_in_as: 'Logged in as'
   login: 'Login'
-  modify: 'Modify' 
+  modify: 'Modify'
   more: 'More'
+  more_info: 'More Info'
   name: 'Name'
   new_homepage: 'New Homepage'
   new_layout: 'New Layout'    
@@ -86,13 +115,16 @@ en:
   new_password: 'New Password'
   new_snippet: 'New Snippet'
   new_user: 'New User'  
+  no: 'No'
   no_layouts: 'No Layouts'
   no_pages: 'No Pages'
   no_snippets: 'No Snippets'
+  normal_page: 'Normal Page'
   notes: 'Notes'    
   optional: 'Optional'
   or: 'or'
   page: 'Page'
+  page_hierarchy: 'Page hierarchy of the current site'
   page_page: 'Page Part'
   page_title: 'Page Title'  
   page_type: 'Page Type'
@@ -111,6 +143,7 @@ en:
   preferences_controller:
     error_updating: 'There was an error updating your preferences.'      
     updated: 'Your preferences have been updated.' 
+  preview: 'Preview'
   published: 'Published'
   published_at: 'Published at' 
   published_on: 'Published On'
@@ -118,18 +151,19 @@ en:
   remember_me: 'Remember me'
   remember_me_in_this_browser: 'Remember me in this browser'
   remove: 'Remove'
+  remove_field: 'Remove Field'
   remove_layout: 'Remove Layout'
   remove_page: 'Remove Page'
-  remove_pages: 'Remove {{pages}}'
+  remove_pages: 'Remove %{pages}'
   remove_snippet: 'Remove Snippet'
   remove_tab: 'Remove Tab'
   remove_user: 'Remove user'
   required: 'Required'  
   resource_controller:
-    not_found: "{{humanized_model_name}} could not be found."
-    removed: "{{humanized_model_name}} has been deleted."
-    saved: "{{humanized_model_name}} saved below."
-    update_conflict: "{{humanized_model_name}} has been modified since it was last loaded. Changes cannot be saved without potentially losing data." 
+    not_found: "%{humanized_model_name} could not be found."
+    removed: "%{humanized_model_name} has been deleted."
+    saved: "%{humanized_model_name} saved below."
+    update_conflict: "%{humanized_model_name} has been modified since it was last loaded. Changes cannot be saved without potentially losing data."
     validation_errors: "Validation errors occurred while processing this form. Please take a moment to  review the form and correct any input errors before continuing."
   reviewed: 'Reviewed'
   roles: 'Roles'
@@ -143,6 +177,7 @@ en:
     none: '<none>' 
     normal: '<normal>'
   settings: 'Settings'
+  show_all: 'Show all'
   slug: 'Slug'
   snippet: 'Snippet'   
   snippets: 'Snippets'
@@ -153,7 +188,7 @@ en:
     layouts:
       remove_warning: 'Are you sure you want to <strong class="warning">permanently remove</strong> the following layout?'   
     pages: 
-      remove_warning: 'Are you sure you want to <strong class="warning">permanently remove</strong> the following {{pages}}?'
+      remove_warning: 'Are you sure you want to <strong class="warning">permanently remove</strong> the following %{pages}?'
     snippets:
       remove_warning: 'Are you sure you want to <strong class="warning">permanently remove</strong> the following snippet?'
     users: 
@@ -176,6 +211,17 @@ en:
     at: 'at'
     by: 'by'
     last_updated: 'Last Updated'
+  type: 'Type'
+  units:
+    KB: "KB"
+    MB: "MB"
+    GB: "GB"
+    seconds: "seconds"
+    minutes: "minutes"
+    hours: "hours"
+    days: "days"
+    weeks: "weeks"
+    months: "months"
   user: 'User'
   username: 'Username'
   username_or_email: 'Username or E-mail Address'
@@ -184,7 +230,9 @@ en:
     cannot_delete_self: 'You cannot delete yourself.'    
   version: 'Version'
   view_site: 'View Site'
+  warning: 'Warning'
   website: 'Website'
   welcome_controller:
     invalid_user: 'Invalid username, e-mail address, or password.' 
     logged_out: 'You are now logged out.'  
+  yes: 'Yes'

data/config/locales/en_available_tags.yml

@@ -7,7 +7,7 @@ en:
 
       *Usage*:
       
-      <pre><code><r:aggregate urls=\"/section1; /section2; /section3\">
+      <pre><code><r:aggregate paths=\"/section1; /section2; /section3\">
         <r:children:count />
       </r:aggregate></code></pre>"
     aggregate-children-each: "Renders the contained block for each child of the aggregated pages.  Accepts the
@@ -15,7 +15,7 @@ en:
 
       *Usage*:
       
-      <pre><code><r:aggregate urls=\"/section1; /section2; /section3\">
+      <pre><code><r:aggregate paths=\"/section1; /section2; /section3\">
         <r:children:each>
             ...
         </r:children:each>
@@ -25,7 +25,7 @@ en:
 
       *Usage*:
       
-      <pre><code><r:aggregate urls=\"/section1; /section2; /section3\">
+      <pre><code><r:aggregate paths=\"/section1; /section2; /section3\">
         <r:children:first>
             ...
         </r:children:first>
@@ -35,34 +35,35 @@ en:
 
       *Usage*:
       
-      <pre><code><r:aggregate urls=\"/section1; /section2; /section3\">
+      <pre><code><r:aggregate paths=\"/section1; /section2; /section3\">
         <r:children:last>
             ...
         </r:children:last>
       </r:aggregate></code></pre>"
     aggregate-each: "Sets the scope to the individual aggregated page allowing you to
-      iterate through each of the listed urls.
+      iterate through each of the listed paths.
       
       *Usage*:
       
-      <pre><code><r:aggregate:each urls=\"/section1; /section2; /section3\"> ... </r:aggregate:each></code></pre>"
-    aggregate: "Aggregates the children of multiple URLs using the @urls@ attribute.
+      <pre><code><r:aggregate:each paths=\"/section1; /section2; /section3\"> ... </r:aggregate:each></code></pre>"
+    aggregate: "Aggregates the children of multiple paths using the @paths@ attribute.
       Useful for combining many different sections/categories into a single
       feed or listing.
       
       *Usage*:
       
-      <pre><code><r:aggregate urls=\"/section1; /section2; /section3\"> ... </r:aggregate></code></pre>"
+      <pre><code><r:aggregate paths=\"/section1; /section2; /section3\"> ... </r:aggregate></code></pre>"
     author: "Renders the name of the author of the current page."
     breadcrumb: "Renders the @breadcrumb@ attribute of the current page."
     breadcrumbs: "Renders a trail of breadcrumbs to the current page. The separator attribute
       specifies the HTML fragment that is inserted between each of the breadcrumbs. By
-      default it is set to @>@. The boolean nolinks attribute can be specified to render
-      breadcrumbs in plain text, without any links (useful when generating title tag).
+      default it is set to @>@. The boolean @nolinks@ attribute can be specified to render
+      breadcrumbs in plain text, without any links (useful when generating title tag). 
+      Set the boolean @noself@ attribute to omit the present page (useful in page headers).
 
       *Usage:*
 
-      <pre><code><r:breadcrumbs [separator=\"separator_string\"] [nolinks=\"true\"] /></code></pre>"
+      <pre><code><r:breadcrumbs [separator=\"separator_string\"] [nolinks=\"true\"] [noself=\"true\"]/></code></pre>"
     children-count: "Renders the total number of children."
     children-each-child: "Page attribute tags inside of this tag refer to the current child. This is occasionally
       useful if you are inside of another tag (like &lt;r:find&gt;) and need to refer back to the
@@ -173,7 +174,8 @@ en:
       *Usage:*
       
       <pre><code><r:children>...</r:children></code></pre>"
-    comment: "Nothing inside a set of comment tags is rendered.
+    comment: "This is deprecated and will be removed. Plase use @<r:hide>@
+      Nothing inside a set of comment tags is rendered.
 
       *Usage:*
 
@@ -189,13 +191,17 @@ en:
       *Usage:*
       
       <pre><code><r:content [part=\"part_name\"] [inherit=\"true|false\"] [contextual=\"true|false\"] /></code></pre>"
-    cycle: "Renders one of the passed values based on a global cycle counter.  Use the @reset@
-      attribute to reset the cycle to the beginning.  Use the @name@ attribute to track
-      multiple cycles; the default is @cycle@.
+    cycle: "Renders a counter value or one of the values given based on a global cycle counter. 
+      
+      To get a numeric counter just use the tag, or specify a start value with @start@.
+      Use the @reset@ attribute to reset the cycle to the beginning. Using @reset@ on a
+      numbered cycle will begin at 0. Use the @name@  attribute to track multiple cycles; 
+      the default is @cycle@.
 
       *Usage:*
       
-      <pre><code><r:cycle values=\"first, second, third\" [reset=\"true|false\"] [name=\"cycle\"] /></code></pre>"
+      <pre><code><r:cycle [values=\"first, second, third\"] [reset=\"true|false\"] [name=\"cycle\"] [start=\"second\"] /></code></pre>
+      <pre><code><r:cycle start=\"3\" /></code></pre>"
     date: "Renders the date based on the current page (by default when it was published or created).
       The format attribute uses the same formating codes used by the Ruby @strftime@ function. By
       default it's set to @&#37;A, &#37;B &#37;d, &#37;Y@.  The @for@ attribute selects which date to render.  Valid
@@ -210,12 +216,17 @@ en:
       *Usage:*
 
       <pre><code><r:escape_html>...</r:escape_html></code></pre>"
-    find: "Inside this tag all page related tags refer to the page found at the @url@ attribute.
-      @url@s may be relative or absolute paths.
+    field: "Renders the content of the field given in the @name@ attribute.
+
+      *Usage:*
+
+      <pre><code><r:field name=\"Keywords\" /></code></pre>"
+    find: "Inside this tag all page related tags refer to the page found at the @path@ attribute.
+      @path@s may be relative or absolute paths.
 
       *Usage:*
 
-      <pre><code><r:find url=\"value_to_find\">...</r:find></code></pre>"
+      <pre><code><r:find path=\"value_to_find\">...</r:find></code></pre>"
     gravatar: "Renders the Gravatar of the author of the current page or the named user.
 
       *Usage:*
@@ -227,6 +238,11 @@ en:
       <pre><code><r:gravatar [name=\"User Name\"]
             [rating=\"G | PG | R | X\"]
             [size=\"32px\"] /></code></pre>"
+    hide: "Nothing inside a set of hide tags is rendered.
+
+      *Usage:*
+
+      <pre><code><r:hide>...</r:hide></code></pre>"
     if_ancestor_or_self: "Renders the contained elements if the current contextual page is either the actual page or one of its parents.
 
       This is typically used inside another tag (like &lt;r:children:each&gt;) to add conditional mark-up if the child element is or descends from the current page.
@@ -259,12 +275,27 @@ en:
       *Usage:*
 
       <pre><code><r:if_dev>...</r:if_dev></code></pre>"
+    if_field: "Renders the contained elements if the field given in the @name@ attribute
+      exists. The tag also takes an optional @equals@ or @matches@ attribute;
+      these will expand the tag if the field's content equals or matches the
+      given string or regex.
+
+      *Usage:*
+
+      <pre><code><r:if_field name=\"author\" [equals|matches=\"John\"] [ignore_case=\"true|false\"]>...</r:if_field></code></pre>"
     if_parent: "Renders the contained elements only if the current contextual page has a parent, i.e.
       is not the root page.
 
       *Usage:*
       
       <pre><code><r:if_parent>...</r:if_parent></code></pre>"
+    if_path: "Renders the containing elements only if the page's path matches the regular expression
+      given in the @matches@ attribute. If the @ignore_case@ attribute is set to false, the
+      match is case sensitive. By default, @ignore_case@ is set to true.
+
+      *Usage:*
+      
+      <pre><code><r:if_path matches=\"regexp\" [ignore_case=\"true|false\"]>...</r:if_path></code></pre>"
     if_self: "Renders the contained elements if the current contextual page is also the actual page.
 
       This is typically used inside another tag (like &lt;r:children:each&gt;) to add conditional mark-up if the child element is the current page.
@@ -272,13 +303,35 @@ en:
       *Usage:*
       
       <pre><code><r:if_self>...</r:if_self></code></pre>"
-    if_url: "Renders the containing elements only if the page's url matches the regular expression
-      given in the @matches@ attribute. If the @ignore_case@ attribute is set to false, the
-      match is case sensitive. By default, @ignore_case@ is set to true.
-
-      *Usage:*
-      
-      <pre><code><r:if_url matches=\"regexp\" [ignore_case=\"true|false\"]>...</r:if_url></code></pre>"
+    javascript: "Renders the content from or a reference to the javascript specified in the @slug@ 
+attribute. Additionally, the @as@ attribute can be used to make the tag render 
+as one of the following:
+
+* with no @as@ value the javascript's content is rendered by default.
+* @inline@ - wraps the javascript's content in an (X)HTML @<script>@ element.
+* @url@ - the full path to the javascript.
+* @link@ - embeds the url in an (X)HTML @<script>@ element (creating a link to the external javascript).
+
+*Additional Options:*
+When rendering @as=\"inline\"@ or @as=\"link\"@, the (X)HTML @type@ attribute
+is automatically be set to the default javascript content-type.
+You can overrride this attribute or add additional ones by passing extra
+attributes to the @<r:javascript>@ tag.
+        
+*Usage:*
+        
+<pre><code><r:javascript slug=\"site.css\" as=\"inline\" 
+  type=\"text/custom\" id=\"my_id\" />
+<r:javascript slug=\"other.js\" as=\"link\" /></code></pre>
+
+The above example will produce the following:
+        
+<pre><code>            <script type=\"text/custom\" id=\"my_id\">
+//<![CDATA[
+  var your_script = 'this content';
+//]]>
+</script>
+<script type=\"text/javascript\" src=\"/js/other.js\"></script></code></pre>"
     link: "Renders a link to the page. When used as a single tag it uses the page's title
       for the link name. When used as a double tag the part in between both tags will
       be used as the link text. The link tag passes all attributes over to the HTML
@@ -350,14 +403,14 @@ en:
       *Usage:*
 
       <pre><code><r:normal><r:unless_last>...</r:unless_last></r:normal></code></pre>"
-    navigation: "Renders a list of links specified in the @urls@ attribute according to three
+    navigation: "Renders a list of links specified in the @paths@ attribute according to three
       states:
 
       * @normal@ specifies the normal state for the link
-      * @here@ specifies the state of the link when the url matches the current
-         page's URL
+      * @here@ specifies the state of the link when the path matches the current
+         page's PATH
       * @selected@ specifies the state of the link when the current page matches
-         is a child of the specified url
+         is a child of the specified path
       # @if_last@ renders its contents within a @normal@, @here@ or
         @selected@ tag if the item is the last in the navigation elements
       # @if_first@ renders its contents within a @normal@, @here@ or
@@ -367,10 +420,10 @@ en:
 
       *Usage:*
 
-      <pre><code><r:navigation urls=\"[Title: url | Title: url | ...]\">
-        <r:normal><a href=\"<r:url />\"><r:title /></a></r:normal>
+      <pre><code><r:navigation paths=\"[Title: path | Title: path | ...]\">
+        <r:normal><a href=\"<r:path />\"><r:title /></a></r:normal>
         <r:here><strong><r:title /></strong></r:here>
-        <r:selected><strong><a href=\"<r:url />\"><r:title /></a></strong></r:selected>
+        <r:selected><strong><a href=\"<r:path />\"><r:title /></a></strong></r:selected>
         <r:between> | </r:between>
       </r:navigation>
       </code></pre>"
@@ -393,6 +446,7 @@ en:
       *Usage:*
       
       <pre><code><r:parent>...</r:parent></code></pre>"
+    path: "Renders the @path@ attribute of the current page."
     random: "Randomly renders one of the options specified by the @option@ tags.
 
       *Usage:*
@@ -436,6 +490,37 @@ en:
       *Usage:*
 
       <pre><code><r:status [downcase='true'] /></code></pre>"
+    stylesheet: "Renders the content from or a reference to the stylesheet specified in the @slug@ 
+attribute. Additionally, the @as@ attribute can be used to make the tag render 
+as one of the following:
+
+* with no @as@ value the stylesheet's content is rendered by default.
+* @inline@ - wraps the stylesheet's content in an (X)HTML @<style>@ element.
+* @url@ - the full path to the stylesheet.
+* @link@ - embeds the url in an (X)HTML @<link>@ element (creating a link to the external stylesheet).
+
+*Additional Options:*
+When rendering @as=\"inline\"@ or @as=\"link\"@, the (X)HTML @type@ attribute
+is automatically be set to the default stylesheet content-type.
+You can overrride this attribute or add additional ones by passing extra
+attributes to the @<r:stylesheet>@ tag.
+        
+*Usage:*
+        
+<pre><code><r:stylesheet slug=\"site.css\" as=\"inline\" 
+  type=\"text/custom\" id=\"my_id\" />
+<r:stylesheet slug=\"other.css\" as=\"link\" 
+  rel=\"alternate stylesheet\" /></code></pre>
+
+The above example will produce the following:
+        
+<pre><code>            <style type=\"text/custom\" id=\"my_id\">
+/*<![CDATA[*/
+  .your_stylesheet { content: 'here' }
+/*]]>*/
+</style>
+<link rel=\"alternate stylesheet\" type=\"text/css\" 
+  href=\"/css/other.css\" /></code></pre>"
     textile: "Filters its contents with the Textile filter.
 
       *Usage*:
@@ -483,12 +568,25 @@ en:
       *Usage:*
 
       <pre><code><r:unless_dev>...</r:unless_dev></code></pre>"
+    unless_field: "The opposite of @if_field@. Renders the contained elements unless the field
+      given in the @name@ attribute exists. The tag also takes an optional
+      @equals@ or @matches@ attribute; these will expand the tag unless the
+      field's content equals or matches the given string or regex.
+
+      *Usage:*
+
+      <pre><code><r:unless_field name=\"author\" [equals|matches=\"John\"] [ignore_case=\"true|false\"]>...</r:unless_field></code></pre>"
     unless_parent: "Renders the contained elements only if the current contextual page has no parent, i.e.
       is the root page.
 
       *Usage:*
       
       <pre><code><r:unless_parent>...</r:unless_parent></code></pre>"
+    unless_path: "The opposite of the @if_path@ tag.
+
+      *Usage:*
+      
+      <pre><code><r:unless_path matches=\"regexp\" [ignore_case=\"true|false\"]>...</r:unless_path></code></pre>"
     unless_self: "Renders the contained elements unless the current contextual page is also the actual page.
 
       This is typically used inside another tag (like &lt;r:children:each&gt;) to add conditional mark-up unless the child element is the current page.
@@ -496,12 +594,6 @@ en:
       *Usage:*
 
       <pre><code><r:unless_self>...</r:unless_self></code></pre>"
-    unless_url: "The opposite of the @if_url@ tag.
-
-      *Usage:*
-      
-      <pre><code><r:unless_url matches=\"regexp\" [ignore_case=\"true|false\"]>...</r:unless_url></code></pre>"
-    url: "Renders the @url@ attribute of the current page."
     yield: "Used within a snippet as a placeholder for substitution of child content, when
       the snippet is called as a double tag.