themes_for_rails integrated with original theme

Gemfile

@@ -9,7 +9,7 @@ gem 'sqlite3-ruby',:require => 'sqlite3'
 gem 'arel'
 gem 'mysql2'
 gem 'will_paginate'
-gem 'web-app-theme'
+gem 'themes_for_rails'
 gem 'tmail'
 
 # Use unicorn as the web server

Gemfile.lock

@@ -60,12 +60,14 @@ GEM
     sqlite3 (1.3.3)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
+    themes_for_rails (0.4.2)
+      rails (~> 3.0.0)
+      themes_for_rails
     thor (0.14.6)
     tmail (1.2.7.1)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
     tzinfo (0.3.24)
-    web-app-theme (0.6.3)
     will_paginate (2.3.15)
 
 PLATFORMS
@@ -76,6 +78,6 @@ DEPENDENCIES
   mysql2
   rails (= 3.0.7)
   sqlite3-ruby
+  themes_for_rails
   tmail
-  web-app-theme
   will_paginate

Rakefile

@@ -4,4 +4,4 @@
 require File.expand_path('../config/application', __FILE__)
 require 'rake'
 
-Rails3::Application.load_tasks
+Mailr::Application.load_tasks

app/controllers/application_controller.rb

@@ -12,6 +12,11 @@ class ApplicationController < ActionController::Base
   #filter_parameter_logging :password #upgrade to Rails3
 
   protected
+
+  def theme_resolver
+	CDF::CONFIG[:theme] || CDF::CONFIG[:default_theme]
+  end
+
     def secure_user?() true end
     def secure_cust?() false end
     def additional_scripts() "" end

app/controllers/contact_groups_controller.rb

@@ -1,6 +1,10 @@
 class ContactGroupsController < ApplicationController
+
+  theme :theme_resolver
+
   layout 'public'
 
+
   def index
     @contact_group = ContactGroup.new
     @contact_group.customer_id = logged_user

app/controllers/contacts_controller.rb

@@ -1,4 +1,7 @@
 class ContactsController < ApplicationController
+
+  theme :theme_resolver
+
   layout :select_layout
 
   def index

app/controllers/folders_controller.rb

@@ -6,6 +6,8 @@ class FoldersController < ApplicationController
   before_filter :load_imap_session
   after_filter  :close_imap_session
 
+  theme :theme_resolver
+
   layout 'public'
 
   def index

app/controllers/login_controller.rb

@@ -3,6 +3,8 @@ require 'imapmailbox'
 
 class LoginController < ApplicationController
 
+  theme :theme_resolver
+
   def index
     if not(logged_user.nil?)
       redirect_to :controller =>"webmail", :action=>"index"

app/controllers/webmail_controller.rb

@@ -10,6 +10,8 @@ require 'imap_utils'
 class WebmailController < ApplicationController
   include ImapUtils
 
+  theme :theme_resolver
+
   logger.info "*** WebmailController #{logger.inspect}"
 
   # Administrative functions

config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
 require ::File.expand_path('../config/environment',  __FILE__)
-run Rails3::Application
+run Mailr::Application

config/application.rb

@@ -6,7 +6,7 @@ require 'rails/all'
 # you've limited to :test, :development, or :production.
 Bundler.require(:default, Rails.env) if defined?(Bundler)
 
-module Rails3
+module Mailr
   class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers

config/default_site.rb

@@ -45,7 +45,8 @@ module CDF
   :crypt_session_pass => true, # Set it to false (in site.rb) if you get any error messages like
                                # "Unsupported cipher algorithm (aes-128-cbc)." - meaning that OpenSSL modules for crypt algo is not loaded. Setting it to false will store password in session in plain format!
   :send_from_domain => nil, # Set this variable to your domain name in site.rb if you make login to imap only with username (without '@domain')
-  :imap_bye_timeout_retry_seconds => 2
+  :imap_bye_timeout_retry_seconds => 2,
+  :default_theme => 'original'
   }
 end
 

config/environment.rb

@@ -2,4 +2,4 @@
 require File.expand_path('../application', __FILE__)
 
 # Initialize the rails application
-Rails3::Application.initialize!
+Mailr::Application.initialize!

config/environments/development.rb

@@ -1,4 +1,4 @@
-Rails3::Application.configure do
+Mailr::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # In the development environment your application's code is reloaded on

config/environments/production.rb

@@ -1,4 +1,4 @@
-Rails3::Application.configure do
+Mailr::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # The production environment is meant for finished, "live" apps.

config/environments/test.rb

@@ -1,4 +1,4 @@
-Rails3::Application.configure do
+Mailr::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # The test environment is used exclusively to run your application's

config/initializers/secret_token.rb

@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Rails3::Application.config.secret_token = 'ade84d567b0c637fd3547fd18b97d1677fd6ca3c5331e6ed1a1b13bb6a7823cc367cbe317caf102f29f8c35eb487ff3ca33e6321d037c14ebb055eb530841ff6'
+Mailr::Application.config.secret_token = 'ade84d567b0c637fd3547fd18b97d1677fd6ca3c5331e6ed1a1b13bb6a7823cc367cbe317caf102f29f8c35eb487ff3ca33e6321d037c14ebb055eb530841ff6'

config/initializers/session_store.rb

@@ -1,6 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
-Rails3::Application.config.session_store :cookie_store, :key => '_rails3_session'
+Mailr::Application.config.session_store :cookie_store, :key => '_mailr_session'
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information

config/routes.rb

@@ -1,4 +1,6 @@
-Rails3::Application.routes.draw do
+Mailr::Application.routes.draw do
+  themes_for_rails
+
     resources :folders
     resources :contacts do
         collection do

public/javascripts/global.js

@@ -1 +0,0 @@
-function changeLoc(loc){window.location=loc}function getCookie(name){var prefix=name+"=";var cStr=document.cookie;var start=cStr.indexOf(prefix);if(start==-1){return null;}var end=cStr.indexOf(";",start+prefix.length);if(end==-1){end=cStr.length;}var value=cStr.substring(start+prefix.length,end);return unescape(value);}function setCookie(name,value,expiration){document.cookie=name+"="+value+"; expires="+expiration;}function toggleCheckbox(checkBox){var element=document.getElementById(checkBox.id);if(element.value=="1"||element.checked){element.checked=false;element.value="0";}else{element.checked=true;element.value="1";}}function toggleChkbox(checkBox){if(checkBox.checked){checkBox.checked=true;}else{checkBox.checked=false;}}function toggle_list(id){ul="ul_"+id;img="img_"+id;hid="h_"+id;ulElement=document.getElementById(ul);imgElement=document.getElementById(img);hiddenElement=document.getElementById(hid);if(ulElement){if(ulElement.className=='closed'){ulElement.className="open";imgElement.src="/images/list_opened.gif";hiddenElement.value="1"}else{ulElement.className="closed";imgElement.src="/images/list_closed.gif";hiddenElement.value="0"}}}function toggle_layer(id){lElement=document.getElementById(id);imgElement=document.getElementById("img_"+id);if(lElement){if(lElement.className=='closed'){lElement.className="open";imgElement.src="/images/list_opened.gif";return true;}else{lElement.className="closed";imgElement.src="/images/list_closed.gif";return false;}}return true;}function toggle_layer_status(id){lElement=document.getElementById(id);if(lElement){if(lElement.className=='closed'){return false;}else{return true;}}return true;}function toggle_text(id){if(document.getElementById)elem=document.getElementById(id);else if(document.all)elem=eval("document.all."+id);else return false;if(!elem)return true;elemStyle=elem.style;if(elemStyle.display!="block"){elemStyle.display="block"}else{elemStyle.display="none"}return true;}function getFF(id){if(document.getElementById)elem=document.getElementById(id);else if(document.all)elem=document.eval("document.all."+id);return elem}function setFF(id,value){if(getFF(id))getFF(id).value=value;}function setCFF(id){if(getFF(id))getFF(id).checked=true;}function updateSUFromC(btnName){var suem=getCookie('_cdf_em');var sueg=getCookie('_cdf_gr');if(suem!=""&&suem!=null&&suem!="undefined"){setFF('sup_email',suem);setFF('signup_submit_button',btnName);}if(sueg&&sueg!=""){if(sueg.indexOf(",")<0&&sueg!=""){gr_id=sueg;setCFF('supgr_'+gr_id);}else while((i=sueg.indexOf(","))>=0){gr_id=sueg.substring(0,i);sueg=sueg.substring(i+1);setCFF('supgr_'+gr_id);}if(sueg.indexOf(",")<0&&sueg!=""){gr_id=sueg;setCFF('supgr_'+gr_id);}}}function updateLUEfC(){var suem=getCookie('_cdf_em');if(suem!=""&&suem!=null&&suem!="undefined"){setFF('login_user_email',suem);}}function replaceHRFST(ifrm){var o=ifrm;var w=null;if(o.contentWindow){w=o.contentWindow;}else if(window.frames&&window.frames[o.id].window){w=window.frames[o.id];}else return;var doc=w.document;if(!doc.getElementsByTagName)return;var anchors=doc.getElementsByTagName("a");for(var i=0;i<anchors.length;i++){var anchor=anchors[i];if(anchor.getAttribute("href"))anchor.target="_top";}iHeight=doc.body.scrollHeight;ifrm.style.height=iHeight+"px"}function rs(n,u,w,h,x){args="width="+w+",height="+h+",resizable=yes,scrollbars=yes,status=0";remote=window.open(u,n,args);if(remote!=null&&remote.opener==null)remote.opener=self;if(x==1)return remote;}function wizard_step_onclick(direction,alt_url){if(document.forms[0]){direction_elem='';if(document.getElementById){direction_elem=document.getElementById('wiz_dir');}else if(document.all){direction_elem=document.eval("document.all.wiz_dir");}if(direction_elem){direction_elem.value=direction;}if(document.forms[0].onsubmit){document.forms[0].onsubmit();}document.forms[0].submit();}else{window.location=alt_url;}}function toggle_adtype(ad_type){toggle_text('upload_banner_label');toggle_text('upload_banner');toggle_text('radio1_label');toggle_text('radio1');toggle_text('radio2_label');toggle_text('radio2');toggle_text('adtitle_label');toggle_text('adtitle');toggle_text('adtext_label');toggle_text('adtext');toggle_text('banner_size_label');toggle_text('banner_size');}function show_date_as_local_time(){var spans=document.getElementsByTagName('span');for(var i=0;i<spans.length;i++)if(spans[i].className.match(/\bLOCAL_TIME\b/i)){system_date=new Date(Date.parse(spans[i].innerHTML));if(system_date.getHours()>=12){adds='&nbsp;PM';h=system_date.getHours()-12;}else{adds='&nbsp;AM';h=system_date.getHours();}spans[i].innerHTML=h+":"+(system_date.getMinutes()+"").replace(/\b(\d)\b/g,'0$1')+adds;}}function PopupPic(sPicURL,sWidth,sHeight){window.open("/popup.htm?"+sPicURL,"","resizable=1,HEIGHT="+sHeight+",WIDTH="+sWidth+",scrollbars=yes");}function open_link(target,location){if(target=='blank'){window.open(location);}else{window.top.location=location;}}

themes/original/javascripts/global.js

@@ -0,0 +1,216 @@
+function changeLoc(loc) {
+    window.location = loc
+}
+function getCookie(name) {
+    var prefix = name + "=";
+    var cStr = document.cookie;
+    var start = cStr.indexOf(prefix);
+    if (start == -1) {
+        return null;
+    }
+    var end = cStr.indexOf(";", start + prefix.length);
+    if (end == -1) {
+        end = cStr.length;
+    }
+    var value = cStr.substring(start + prefix.length, end);
+    return unescape(value);
+}
+function setCookie(name, value, expiration) {
+    document.cookie = name + "=" + value + "; expires=" + expiration;
+}
+function toggleCheckbox(checkBox) {
+    var element = document.getElementById(checkBox.id);
+    if (element.value == "1" || element.checked) {
+        element.checked = false;
+        element.value = "0";
+    } else {
+        element.checked = true;
+        element.value = "1";
+    }
+}
+function toggleChkbox(checkBox) {
+    if (checkBox.checked) {
+        checkBox.checked = true;
+    } else {
+        checkBox.checked = false;
+    }
+}
+function toggle_list(id) {
+    ul = "ul_" + id;
+    img = "img_" + id;
+    hid = "h_" + id;
+    ulElement = document.getElementById(ul);
+    imgElement = document.getElementById(img);
+    hiddenElement = document.getElementById(hid);
+    if (ulElement) {
+        if (ulElement.className == 'closed') {
+            ulElement.className = "open";
+            imgElement.src = "/themes/original/images/list_opened.gif";
+            hiddenElement.value = "1"
+        } else {
+            ulElement.className = "closed";
+            imgElement.src = "/themes/original/images/list_closed.gif";
+            hiddenElement.value = "0"
+        }
+    }
+}
+function toggle_layer(id) {
+    lElement = document.getElementById(id);
+    imgElement = document.getElementById("img_" + id);
+    if (lElement) {
+        if (lElement.className == 'closed') {
+            lElement.className = "open";
+            imgElement.src = "/themes/original/images/list_opened.gif";
+            return true;
+        } else {
+            lElement.className = "closed";
+            imgElement.src = "/themes/original/images/list_closed.gif";
+            return false;
+        }
+    }
+    return true;
+}
+function toggle_layer_status(id) {
+    lElement = document.getElementById(id);
+    if (lElement) {
+        if (lElement.className == 'closed') {
+            return false;
+        } else {
+            return true;
+        }
+    }
+    return true;
+}
+function toggle_text(id) {
+    if (document.getElementById) elem = document.getElementById(id);
+    else if (document.all) elem = eval("document.all." + id);
+    else return false;
+    if (!elem) return true;
+    elemStyle = elem.style;
+    if (elemStyle.display != "block") {
+        elemStyle.display = "block"
+    } else {
+        elemStyle.display = "none"
+    }
+    return true;
+}
+function getFF(id) {
+    if (document.getElementById) elem = document.getElementById(id);
+    else if (document.all) elem = document.eval("document.all." + id);
+    return elem
+}
+function setFF(id, value) {
+    if (getFF(id)) getFF(id).value = value;
+}
+function setCFF(id) {
+    if (getFF(id)) getFF(id).checked = true;
+}
+function updateSUFromC(btnName) {
+    var suem = getCookie('_cdf_em');
+    var sueg = getCookie('_cdf_gr');
+    if (suem != "" && suem != null && suem != "undefined") {
+        setFF('sup_email', suem);
+        setFF('signup_submit_button', btnName);
+    }
+    if (sueg && sueg != "") {
+        if (sueg.indexOf(",") < 0 && sueg != "") {
+            gr_id = sueg;
+            setCFF('supgr_' + gr_id);
+        } else while ((i = sueg.indexOf(",")) >= 0) {
+            gr_id = sueg.substring(0, i);
+            sueg = sueg.substring(i + 1);
+            setCFF('supgr_' + gr_id);
+        }
+        if (sueg.indexOf(",") < 0 && sueg != "") {
+            gr_id = sueg;
+            setCFF('supgr_' + gr_id);
+        }
+    }
+}
+function updateLUEfC() {
+    var suem = getCookie('_cdf_em');
+    if (suem != "" && suem != null && suem != "undefined") {
+        setFF('login_user_email', suem);
+    }
+}
+function replaceHRFST(ifrm) {
+    var o = ifrm;
+    var w = null;
+    if (o.contentWindow) {
+        w = o.contentWindow;
+    } else if (window.frames && window.frames[o.id].window) {
+        w = window.frames[o.id];
+    } else return;
+    var doc = w.document;
+    if (!doc.getElementsByTagName) return;
+    var anchors = doc.getElementsByTagName("a");
+    for (var i = 0; i < anchors.length; i++) {
+        var anchor = anchors[i];
+        if (anchor.getAttribute("href")) anchor.target = "_top";
+    }
+    iHeight = doc.body.scrollHeight;
+    ifrm.style.height = iHeight + "px"
+}
+function rs(n, u, w, h, x) {
+    args = "width=" + w + ",height=" + h + ",resizable=yes,scrollbars=yes,status=0";
+    remote = window.open(u, n, args);
+    if (remote != null && remote.opener == null) remote.opener = self;
+    if (x == 1) return remote;
+}
+function wizard_step_onclick(direction, alt_url) {
+    if (document.forms[0]) {
+        direction_elem = '';
+        if (document.getElementById) {
+            direction_elem = document.getElementById('wiz_dir');
+        } else if (document.all) {
+            direction_elem = document.eval("document.all.wiz_dir");
+        }
+        if (direction_elem) {
+            direction_elem.value = direction;
+        }
+        if (document.forms[0].onsubmit) {
+            document.forms[0].onsubmit();
+        }
+        document.forms[0].submit();
+    } else {
+        window.location = alt_url;
+    }
+}
+function toggle_adtype(ad_type) {
+    toggle_text('upload_banner_label');
+    toggle_text('upload_banner');
+    toggle_text('radio1_label');
+    toggle_text('radio1');
+    toggle_text('radio2_label');
+    toggle_text('radio2');
+    toggle_text('adtitle_label');
+    toggle_text('adtitle');
+    toggle_text('adtext_label');
+    toggle_text('adtext');
+    toggle_text('banner_size_label');
+    toggle_text('banner_size');
+}
+function show_date_as_local_time() {
+    var spans = document.getElementsByTagName('span');
+    for (var i = 0; i < spans.length; i++) if (spans[i].className.match(/\bLOCAL_TIME\b/i)) {
+        system_date = new Date(Date.parse(spans[i].innerHTML));
+        if (system_date.getHours() >= 12) {
+            adds = '&nbsp;PM';
+            h = system_date.getHours() - 12;
+        } else {
+            adds = '&nbsp;AM';
+            h = system_date.getHours();
+        }
+        spans[i].innerHTML = h + ":" + (system_date.getMinutes() + "").replace(/\b(\d)\b/g, '0$1') + adds;
+    }
+}
+function PopupPic(sPicURL, sWidth, sHeight) {
+    window.open("/popup.htm?" + sPicURL, "", "resizable=1,HEIGHT=" + sHeight + ",WIDTH=" + sWidth + ",scrollbars=yes");
+}
+function open_link(target, location) {
+    if (target == 'blank') {
+        window.open(location);
+    } else {
+        window.top.location = location;
+    }
+}

themes/original/javascripts/global_src.js

@@ -43,11 +43,11 @@ function toggle_list(id){
     if (ulElement){
       if (ulElement.className == 'closed'){
           ulElement.className = "open";
-            imgElement.src = "/images/list_opened.gif";
+            imgElement.src = "/themes/original/images/list_opened.gif";
             hiddenElement.value = "1"
         }else{
           ulElement.className = "closed";
-            imgElement.src = "/images/list_closed.gif";
+            imgElement.src = "/themes/original/images/list_closed.gif";
             hiddenElement.value = "0"
         }
     }
@@ -58,11 +58,11 @@ function toggle_layer(id) {
   if (lElement){
     if (lElement.className == 'closed'){
         lElement.className = "open";
-        imgElement.src = "/images/list_opened.gif";
+        imgElement.src = "/themes/original/images/list_opened.gif";
         return true;
       }else{
         lElement.className = "closed";
-        imgElement.src = "/images/list_closed.gif";
+        imgElement.src = "/themes/original/images/list_closed.gif";
         return false;
       }
   }

themes/original/stylesheets/admin.css

@@ -229,33 +229,33 @@ div.gal ul li.galdel {display: block; text-align: left; padding: 0 15px; margin:
   border: 1px dashed #DCDCDC;
 }
 
-#mmhomepage, #mmhomepage a { background-image: url(/images/homepage.gif); }
-#mmlogo, #mmlogo a { background-image: url(/images/logo.gif); }
-#mmwebmail, #mmwebmail a { background-image: url(/images/webmail.gif); }
-#mmcontacts, #mmcontacts a { background-image: url(/images/contacts.gif); }
-#mmcontactgroups, #mmcontactgroups a { background-image: url(/images/contact_groups.gif); }
-#mmcontactscales, #mmcontactscales a { background-image: url(/images/contact_scales.gif); }
-#mmarticletypes, #mmarticletypes a { background-image: url(/images/article_types.gif); }
-#mmarticles, #mmarticles a { background-image: url(/images/articles.gif); }
-#mmgallery, #mmgallery a { background-image: url(/images/image.gif); }
-#mmcategories, #mmcategories a { background-image: url(/images/categories.gif); }
-#mmregion, #mmregion a { background-image: url(/images/region.gif); }
-#mmlogout, #mmlogout a { background-image: url(/images/logout.gif); }
-#mmwizard, #mmwizard a { background-image: url(/images/wizard_mirr.gif); }
-#mmpages, #mmpages a { background-image: url(/images/pages.gif); }
-#mmmenueditor, #mmmenueditor a { background-image: url(/images/menueditor.gif); }
-#mmforumcats, #mmforumcats a { background-image: url(/images/forum.gif); }
-#mmforums, #mmforums a { background-image: url(/images/forum.gif); }
-#mmchnagepassword, #mmchnagepassword a { background-image: url(/images/password.gif); }
-#mmblog, #mmblog a { background-image: url(/images/blog.gif); }
-#mmcar, #mmcar a { background-image: url(/images/car.gif); }
-#mmpathstatpath, #mmpathstatpath a { background-image: url(/images/stats.gif); }
-#mmnewsletters, #mmnewsletters a { background-image: url(/images/newsletters.gif); }
-#mmadvert, #mmadvert a { background-image: url(/images/advert.gif); }
-#mmforms, #mmforms a { background-image: url(/images/formbuilder.gif); }
-#mmattachments, #mmattachments a  { background-image: url(/images/attachment.gif); }
-#mmphoto, #mmphoto a { background-image: url(/images/photo.gif); }
-#mmtypo, #mmtypo a { background-image: url(/images/typo.gif); }
+#mmhomepage, #mmhomepage a { background-image: url("/themes/original/images/homepage.gif"); }
+#mmlogo, #mmlogo a { background-image: url("/themes/original/images/logo.gif"); }
+#mmwebmail, #mmwebmail a { background-image: url("/themes/original/images/webmail.gif"); }
+#mmcontacts, #mmcontacts a { background-image: url("/themes/original/images/contacts.gif"); }
+#mmcontactgroups, #mmcontactgroups a { background-image: url("/themes/original/images/contact_groups.gif"); }
+#mmcontactscales, #mmcontactscales a { background-image: url("/themes/original/images/contact_scales.gif"); }
+#mmarticletypes, #mmarticletypes a { background-image: url("/themes/original/images/article_types.gif"); }
+#mmarticles, #mmarticles a { background-image: url("/themes/original/images/articles.gif"); }
+#mmgallery, #mmgallery a { background-image: url("/themes/original/images/image.gif"); }
+#mmcategories, #mmcategories a { background-image: url("/themes/original/images/categories.gif"); }
+#mmregion, #mmregion a { background-image: url("/themes/original/images/region.gif"); }
+#mmlogout, #mmlogout a { background-image: url("/themes/original/images/logout.gif"); }
+#mmwizard, #mmwizard a { background-image: url("/themes/original/images/wizard_mirr.gif"); }
+#mmpages, #mmpages a { background-image: url("/themes/original/images/pages.gif"); }
+#mmmenueditor, #mmmenueditor a { background-image: url("/themes/original/images/menueditor.gif"); }
+#mmforumcats, #mmforumcats a { background-image: url("/themes/original/images/forum.gif"); }
+#mmforums, #mmforums a { background-image: url("/themes/original/images/forum.gif"); }
+#mmchnagepassword, #mmchnagepassword a { background-image: url("/themes/original/images/password.gif"); }
+#mmblog, #mmblog a { background-image: url("/themes/original/images/blog.gif"); }
+#mmcar, #mmcar a { background-image: url("/themes/original/images/car.gif"); }
+#mmpathstatpath, #mmpathstatpath a { background-image: url("/themes/original/images/stats.gif"); }
+#mmnewsletters, #mmnewsletters a { background-image: url("/themes/original/images/newsletters.gif"); }
+#mmadvert, #mmadvert a { background-image: url("/themes/original/images/advert.gif"); }
+#mmforms, #mmforms a { background-image: url("/themes/original/images/formbuilder.gif"); }
+#mmattachments, #mmattachments a  { background-image: url("/themes/original/images/attachment.gif"); }
+#mmphoto, #mmphoto a { background-image: url("/themes/original/images/photo.gif"); }
+#mmtypo, #mmtypo a { background-image: url("/themes/original/images/typo.gif"); }
 
 /* Wizard */
 

themes/original/stylesheets/mailr.css

@@ -3,7 +3,7 @@
 .closed { display: none; }
 
 #logo {
-	background-image: url("/images/logo.png");
+	background-image: url("/themes/original/images/logo.png");
 	background-repeat: no-repeat;
 	height: 125px;
 }
@@ -46,7 +46,7 @@ table.form_layout td.form_actions { text-align: right; }
 /*  Rounded Box Corners
 ---------------------------------------------------------------------- */
 .box {margin: 0 0 0.75em 0; clear: both; position: relative;}
-b.cn { position: absolute; height: 10px; width: 10px; margin: 0; padding: 0; background: url(../images/white.png) no-repeat; line-height: 1px; font-size: 1px; }
+b.cn { position: absolute; height: 10px; width: 10px; margin: 0; padding: 0; background: url("/themes/original/images/white.png") no-repeat; line-height: 1px; font-size: 1px; }
 b.tl {top: -1px; left: -1px; background-position: top left;}
 b.tr {top: -1px; right: -1px; background-position: top right;}
 b.bl {bottom: -1px; left: -1px; background-position: bottom left;}
@@ -55,9 +55,9 @@ b.br {bottom: -1px; right: -1px; background-position: bottom right;}
  /* IE Filters */
 * html b.bl {bottom:-2px}
 * html b.br {bottom:-2px}
-* html b.cn {background-image: url(../images/white.gif);}
+* html b.cn {background-image: url("/themes/original/images/white.gif");}
 
-#container { background: url("../images/d6deec.gif") top left repeat-y; }
+#container { background: url("/themes/original/images/d6deec.gif") top left repeat-y; }
 
 #tab_content { width: 100%; }
 

themes/original/stylesheets/tabs.css

@@ -2,7 +2,7 @@
   background: #789A9F;
   padding-top: 1.8em;
   width: 98%;
-  background-image: url(../images/select.png);
+  background-image: url("/themes/original/images/select.png");
 }
 
 #tab_content {
@@ -49,7 +49,7 @@
   border: 1px solid #666;
   border-bottom: none;
   background: #789A9F;
-  background-image: url(../images/select.png);
+  background-image: url("/themes/original/images/select.png");
   padding-bottom: 4px;
   margin-top: 0;
   color: #000;
@@ -59,7 +59,7 @@
   background: #EDF4F5;
   border: 1px solid #AAA;
   border-bottom: none;
-  background-image: url(../images/deselect.png);
+  background-image: url("/themes/original/images/deselect.png");
 }
 
 #header ul#primary a:hover {

themes/original/views/layouts/chooser.html.erb

@@ -0,0 +1,19 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= @htmllang %>" lang="<%= @htmllang %>">
+  <head>
+    <title><%=@title%></title>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+
+    <%=stylesheet_link_tag current_theme_stylesheet_path('admin') %>
+	<%=stylesheet_link_tag current_theme_stylesheet_path('tabs') %>
+	<%=stylesheet_link_tag current_theme_stylesheet_path('mailr') %>
+	<%=javascript_include_tag current_theme_javascript_path('global')  %>
+
+  </head>
+  <body id="bodyID" onload="<%=@onload_function%>">
+    <%= @content_for_layout %>
+  </body>
+</html>
+
+

themes/original/views/layouts/login.html.erb

@@ -0,0 +1,15 @@
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <title><%=t(:mailr) %> &raquo; <%= t(:please_login)%></title>
+
+    <%=stylesheet_link_tag current_theme_stylesheet_path('admin') %>
+	<%=stylesheet_link_tag current_theme_stylesheet_path('mailr') %>
+
+  </head>
+  <body>
+    <%= yield %>
+  </body>
+</html>

themes/original/views/layouts/public.html.erb

@@ -0,0 +1,31 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= @htmllang %>" lang="<%= @htmllang %>">
+  <head>
+    <title><%= t :mailr %></title>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+
+	<%=stylesheet_link_tag current_theme_stylesheet_path('admin') %>
+	<%=stylesheet_link_tag current_theme_stylesheet_path('tabs') %>
+	<%=stylesheet_link_tag current_theme_stylesheet_path('mailr') %>
+	<%=javascript_include_tag current_theme_javascript_path('global')  %>
+	<%=javascript_include_tag current_theme_javascript_path('webmail') %>
+
+    <%=javascript_include_tag :defaults %>
+
+  </head>
+  <body id="bodyID" onload="<%=@onload_function%>">
+    <div id="wholepage">
+      <div id="container">
+        <div id="sidebar_outer">
+			<div id="logo"></div>
+			<div id="sidebar">
+			<%= yield :sidebar %>
+			</div>
+        </div>
+        <div id="content"><%= yield %></div>
+        <br class="clear"/>
+      </div>
+    </div>
+  </body>
+</html>

themes/original/views/webmail/_message_row.html.erb

@@ -10,5 +10,5 @@
   </td>
   <td class="date"><%= message_date(message_row.date) %></td>
   <td class="size"><%= message_size(message_row.size) %></td>
-  <td class="attachind"><%= message_row.content_type == 'multipart' ? image_tag('attachment.png') : '&nbsp;' %></td>
+  <td class="attachind"><%= message_row.content_type == 'multipart' ? image_tag(current_theme_image_path('attachment.png')) : '&nbsp;' %></td>
 </tr>

themes/original/views/webmail/_search.html.erb

@@ -1,5 +1,5 @@
   <a href='#' onclick='toggle_msg_search(true);'>
-    <%= t :search%><img id='img_msg_search' alt='open' src='/images/list_<%=@srch_img_src%>.gif'/>
+    <%= t :search%><img id='img_msg_search' alt='open' src="<%= current_theme_image_path(@srch_img_src+'.gif') %>"/>
   </a>
   <div id="msg_search" class='<%=@srch_class%>'>
   <%= t :search_txt %>&nbsp;

themes/original/views/webmail/messages.html.erb

@@ -27,7 +27,7 @@
     <input type="hidden" name="page" value="<%=@page%>"/>
 
     <a href='#' onclick='toggle_msg_operations(true);'>
-      <%=t :operations%><img id='img_msgops' alt='open' src='../images/list_<%=@ops_img_src%>.gif'/>
+      <%=t :operations%><img id='img_msgops' alt='open' src="<%= current_theme_image_path(@ops_img_src+'.gif') %>"/>
     </a>
 
     <div id="msgops" class='<%=@ops_class%>'>