Merge branch 'pimp' of git@charlie-dev.cykod.com:webiva-core into pimp

Conflicts:
	script/fake_log_entries.rb

app/controllers/emarketing_controller.rb

@@ -17,17 +17,17 @@ def index
 
 
     @subpages = [
-       [ "Visitor Statistics", :editor_visitors, "emarketing_statistics.gif", { :action => 'visitors' }, 
+       [ "Visitor Statistics", :editor_visitors, "traffic_visitors.png", { :action => 'visitors' }, 
           "View and Track Visitors to your site" ],
-       [ "Real Time Statistics", :editor_visitors, "emarketing_statistics.gif", { :action => 'stats' }, 
+       [ "Real Time Statistics", :editor_visitors, "traffic_realtime.png", { :action => 'stats' }, 
           "View Real Time Visits to your site" ]
     ]
 
     get_handler_info(:chart, :traffic).each do |handler|
-      @subpages << [handler[:name], :editor_visitors, 'emarketing_statistics.gif', handler[:url], handler[:description] || handler[:name]]
+      @subpages << [handler[:name], :editor_visitors, handler[:icon] || 'traffic_page.png', handler[:url], handler[:description] || handler[:name]]
     end
 
-    @subpages << ['Experiments', :editor_visitors, 'emarketing_statistics.gif', {:controller => '/experiment', :action => 'index'}, 'View Experiments Results']
+    @subpages << ['Experiments', :editor_visitors, 'traffic_visitors.png', {:controller => '/experiment', :action => 'index'}, 'View Experiments Results']
   end
 
  include ActiveTable::Controller   

app/controllers/mail_manager_controller.rb

@@ -16,9 +16,9 @@ def index
     cms_page_path [], "Mail"
 
     @subpages =  [ 
-      [ "Subscriptions", :editor_mailing,"emarketing_subscriptions.gif", { :controller => '/subscription' },
+      [ "Subscriptions", :editor_mailing,"mail_subscriptions.png", { :controller => '/subscription' },
           "Edit Newsletters and Mailing Lists Subscriptions" ],
-      [ "Email Templates", :editor_mailing,"emarketing_templates.gif", { :controller => '/mail_manager', :action => 'templates' },
+      [ "Email Templates", :editor_mailing,"mail_templates.png", { :controller => '/mail_manager', :action => 'templates' },
         "Edit Mail Templates" ]
 
       ]

app/controllers/manage/system_controller.rb

@@ -10,23 +10,23 @@ def index
 
 
     @subpages = [
-       [ "Translation", :system_admin, "system_translation.gif",
+       [ "Translation", :system_admin, "system_translation.png",
          { :controller => '/manage/translate' }, 
         "Translate the backend interface"
        ],
-       [ "Clients", :system_admin, "system_clients.gif",
+       [ "Clients", :system_admin, "system_clients.png",
          { :controller => '/manage/clients'}, 
         "Configure the client accounts on the system"
        ],
-       [ "Client\nUsers", :client_admin, "system_client_users.gif",
+       [ "Client\nUsers", :client_admin, "system_client_users.png",
          {  :controller => '/manage/users'  }, 
         "Manage client level users"
        ],
-       [ "Domains", :client_admin, "website_domains.png",
+       [ "Domains", :client_admin, "system_domains.png",
          {  :controller => '/manage/domains' }, 
         "View domains and edit options and components"
        ],
-       [ "Issue Tracker", :system_admin, "system_issues.gif",
+       [ "Issue Tracker", :system_admin, "system_issue_tracker.png",
          {  :controller => '/manage/issues' },
          "View issues that the system has reported"
        ]

app/controllers/options_controller.rb

@@ -80,19 +80,19 @@ def configuration
 
 
      @subpages = [
-       [ "Domain Options", :editor_editors, "website_configuration.png",
+       [ "Domain Options", :editor_editors, "config_domain.png",
          { :action => 'domain_options' }, 
         "Manage domain level options"
        ],
-       [ "Languages", :editor_editors, "website_configuration.png",
+       [ "Languages", :editor_editors, "config_languages.png",
          { :action => 'languages' }, 
         "Configure the available languages on the site"
        ],
-       [ "Files", :editor_editors, "website_configuration.png",
+       [ "Files", :editor_editors, "config_files.png",
          { :action => 'files' }, 
         "Manage the file processor for Files uploaded to the system"
        ],
-       [ "Image Sizes", :editor_editors, "website_configuration.png",
+       [ "Image Sizes", :editor_editors, "config_image_sizes.png",
          { :action => 'image_sizes' }, 
         "Configure image sizes available on the site"
        ]

app/controllers/structure_controller.rb

@@ -412,6 +412,7 @@ def create_revision
                SiteNode,
                [ hdr(:string, 'node_path', :label => 'Url'),
                  hdr(:static, 'Title'),
+                 hdr(:static, 'Menu Title'),
                  hdr(:static, 'Meta Description'),
                  hdr(:static, 'Meta Keywords')
                ]

app/models/content_node.rb

@@ -243,7 +243,7 @@ def self.internal_search(language,query,options = { }) #:nodoc:
   def self.chart_traffic_handler_info
     {
       :name => 'Content Traffic',
-      :url => { :controller => '/emarketing', :action => 'charts', :path => ['traffic'] + self.name.underscore.split('/') },
+      :url => { :controller => '/emarketing', :action => 'charts', :path => ['traffic'] + self.name.underscore.split('/') }, :icon => 'traffic_content.png',
       :type_options => :traffic_type_options
     }
   end

app/models/domain_log_referrer.rb

@@ -21,6 +21,7 @@ def admin_url
   def self.chart_traffic_handler_info
     {
       :name => 'Referrer Traffic',
+      :icon => 'traffic_referrer.png',
       :url => { :controller => '/emarketing', :action => 'charts', :path => ['traffic'] + self.name.underscore.split('/') }
     }
   end

app/models/site_node.rb

@@ -535,6 +535,7 @@ def self.chart_traffic_handler_info
     {
       :name => 'Page Traffic',
       :title => :node_path,
+      :icon => 'traffic_page.png',
       :url => { :controller => '/emarketing', :action => 'charts', :path => ['traffic'] + self.name.underscore.split('/') }
     }
   end

app/views/application/_header_mce.rhtml

@@ -0,0 +1,52 @@
+
+
+
+
+<title><%= (@cms_page_info ? @cms_page_info[:page_title] : @title) ||  "CMS" %></title>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
+<META NAME="ROBOTS" CONTENT="NOINDEX, NOFOLLOW, NOCACHE">
+
+
+<%= stylesheet_link_tag 'common' %>
+<link href='http://fonts.googleapis.com/css?family=Droid+Sans' rel='stylesheet' type='text/css'>
+<%= theme_stylesheet_link_tag  "admin_design", :media => 'all' %>
+<%= theme_stylesheet_link_tag  "admin_framework", :media => 'all' %>
+<script> var AUTH_TOKEN = "<%= form_authenticity_token.to_s %>";</script>
+
+<%= remote_script 'ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.js' %>
+<%= remote_script 'ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/jquery-ui.min.js' %>
+<script>
+   $j = jQuery.noConflict();
+</script>
+<%= javascript_include_tag 'jaction' %>
+<script type="text/javascript" src="http://www.google.com/jsapi"></script>
+
+<% unless @no_legacy_cs %>
+<%= javascript_include_tag "overlib/overlib" %>
+<%= javascript_include_tag :defaults %>
+  
+<%= javascript_include_tag "builder" %>
+<%= javascript_include_tag "slider" %>
+<%= javascript_include_tag "swfobject" %>
+<%= javascript_include_tag "tiny_mce/tiny_mce_popup" %>
+<%= javascript_include_tag 'redbox' %>
+<% end -%>
+<%= javascript_include_tag 'active_table' %>
+<%= javascript_include_tag 'shortcut' %>
+
+<%= @header if @header %>
+<%= @extra_header if @extra_header %>
+<% if @js_header -%>
+  <% @js_header.uniq.each do |js| -%>
+    <% if js.to_s.include?('http://') -%>
+      <script src="<%= vh js %>" type='text/javascript'></script>
+    <% else -%>
+      <%= javascript_include_tag js %>
+    <% end -%>
+  <% end -%>
+<% end -%>
+<% if @css_header -%>
+  <% @css_header.uniq.each do |css| -%>
+    <%= stylesheet_link_tag css %>
+  <% end -%>
+<% end -%>

app/views/layouts/manage_mce.rhtml

@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
-  <%= render :partial => '/application/header' %>
+  <%= render :partial => '/application/header_mce' %>
 
 <script>
   MCE_Popup = {

app/views/manage/access/login.rhtml

@@ -1,3 +1,4 @@
+<hr/>
 <div align='center' style='padding:30px'>
 <% if !DomainModel.active_domain[:active] -%>
   <div class='error'><%= DomainModel.active_domain[:inactive_message] -%></div>
@@ -8,6 +9,7 @@
 
 	<%= f.text_field :username %>
 	<%= f.password_field :password %>
+  <%= f.spacer %>
 	<%= f.submit_tag "Login" %>
 <% end -%>	
 </div>

app/views/members/_note.html.erb

@@ -1,8 +1,8 @@
-<div id="user_note" class='cms_form admin_form' style='width:650px;'>
+<div id="user_note" class='cms_form admin_form' style='width:680px;'>
 <div align="right"><a href="javascript:void(0);" onclick="RedBox.close();">[x] close</a></div>
 <h3><%= @user.name %></h3>
 
-<div class='admin_content' style='width:315px; padding-right:10px; float:left;'>
+<div style='width:315px; padding-right:10px; float:left;'>
 <% stat_view do |t| -%>
   <%= t.raw 'First Name'.t,  @user.first_name %>
   <%= t.raw 'Last Name'.t,  @user.last_name %>
@@ -21,7 +21,7 @@
 
 </div>
 
-<div class="admin_content" style='width:325px; float:left;'>
+<div style='width:325px; float:left;'>
 
 <% remote_cms_form_for :note, @note, :update => 'RB_window' do |f| %>
   <%= f.text_area :note, :rows => 3, :vertical => true, :label => 'Note'.t %>

app/views/structure/_edit_page_revision.html.erb

@@ -4,6 +4,7 @@
 
 <% remote_cms_form_for :revision, @revision, :update => 'WD_redbox' do |f| -%>
 <%= f.text_field :title %>
+<%= f.text_field :menu_title %>
 <%= f.text_area :meta_description, :rows => 3 %>
 <%= f.text_area :meta_keywords, :rows => 3 %>
 <%= f.spacer %>

app/views/structure/_experiment_info.html.erb

@@ -1,5 +1,11 @@
 <hr/>
-<h2><%= 'Experiments'.t %></h2>
+<% if experiment.started? && ! experiment.finished? -%>
+   <h2><%= 'Active Experiment'.t %></h2>
+ <% elsif experiment.finished? %>
+   <h2><%= 'Last Experiment'.t %></h2>
+ <% else %>
+   <h2><%= "Current Experiment (Not Started)".t %></h2>
+<% end -%>
 
 <div class="clearfix">
 
@@ -17,15 +23,15 @@
 <% if ! experiment.started? && ! experiment.finished? -%>
   <li>Experiment has not started. <a href="javascript:void(0);" onclick="StructureEditor.updateExperiment(<%= experiment.id %>, '<%= jh experiment.language %>', 'start')">Start it now.</a></li>
 <% elsif experiment.is_running? -%>
-  <li><strong><%= "Started on:".t %></strong> <%= experiment.started_at.to_s(:datetime) %></li>
+  <li><strong><%= "Started on:".t %></strong> <%= experiment.started_at.to_s(:long) %></li>
   <li>
     <strong><%= "Ends on:".t %></strong> <%= experiment.ended_at ? experiment.ended_at.to_s(:datetime) : '(not set)'.t %>
     <a href="javascript:void(0);" onclick="StructureEditor.updateExperiment(<%= experiment.id %>, '<%= jh experiment.language %>', 'stop')">stop</a>
   </li>
 <% elsif experiment.finished? -%>
-  <li><strong><%= "Started on:".t %></strong> <%= experiment.started_at.to_s(:datetime) %></li>
+  <li><strong><%= "Started on:".t %></strong> <%= experiment.started_at.to_s(:long) %></li>
   <li>
-    <strong><%= "Ended on:".t %></strong> <%= experiment.ended_at.to_s(:datetime) %>
+    <strong><%= "Ended on:".t %></strong> <%= experiment.ended_at.to_s(:long) %>
     <a href="javascript:void(0);" onclick="StructureEditor.updateExperiment(<%= experiment.id %>, '<%= jh experiment.language %>', 'restart')">restart</a>
   </li>
 <% end -%>

app/views/structure/_group_element_info.rhtml

@@ -23,7 +23,7 @@ GroupEditor= {
 
 </script><% if permit?('editor_structure') %>
 <ul class='page_detail_buttons'>
-  <li class='icon'><a href='javascript:void(0);'  title='<%= vh 'Delete Group'.t%>' onclick='StructureEditor.nodeDelete(<%= @node.id %>,"<%= jh "Are you sure you want to delete this group and all it\'s sub-pages?" .t %>");'><%= image_tag(theme_src('icons/header_actions/delete_page.png')) %></a></li>
+  <li class='icon'><a href='javascript:void(0);'  title='<%= vh 'Delete Group'.t%>' onclick='StructureEditor.nodeDelete(<%= @node.id %>,"<%= jvh "Are you sure you want to delete this group and all it\'s sub-pages?" .t %>");'><%= image_tag(theme_src('icons/header_actions/delete_page.png')) %></a></li>
 </ul>  
 <% end -%>
 

app/views/structure/_path.rhtml

@@ -41,10 +41,9 @@
    	node_title_click = "StructureEditor.groupPopup('#{path.id}')"
    end
  -%>
-   
 
 <% path.site_node_modifiers.each do |mod| -%>
-   <% if mod.modifier_type  != 'page' -%>
+   <% if mod.modifier_type.to_s  != 'page' -%>
      <% if @display_modifiers == 'show'  -%>
         <%= render :partial => 'site_node_modifier', :locals => { :mod => mod } %>
     <% end -%>

app/views/structure/_site_nodes_table.html.erb

@@ -15,6 +15,7 @@
     <% end -%>
   </td>
   <td><%= h truncate(revision.title, :length => 80) %></td>
+  <td><%= h truncate(revision.menu_title, :length => 30) %></td>
   <td><%= h truncate(revision.meta_description, :length => 80) %></td>
   <td><%= h truncate(revision.meta_keywords, :length => 80) %></td>
 </tr>