Remove dimp prefix from CSS classes/DOM IDs

imp/js/base.js

@@ -230,13 +230,13 @@ var ImpBase = {
                     : this.view;
             }
 
-            if (this.view != data || !$('dimpmain_folder').visible()) {
+            if (this.view != data || !$('impbase_folder').visible()) {
                 this.highlightSidebar(data);
-                if ($('dimpmain_iframe').visible()) {
-                    tmp = $('dimpmain_iframe').hide().down();
+                if ($('impbase_iframe').visible()) {
+                    tmp = $('impbase_iframe').hide().down();
                     tmp.blur();
                 }
-                $('dimpmain_folder').show();
+                $('impbase_folder').show();
             }
 
             this.loadMailbox(data);
@@ -250,8 +250,8 @@ var ImpBase = {
             }
         }
 
-        $('dimpmain_folder').hide();
-        $('dimpmain_iframe').show();
+        $('impbase_folder').hide();
+        $('impbase_iframe').show();
 
         switch (type) {
         case 'search':
@@ -267,7 +267,7 @@ var ImpBase = {
 
             this.highlightSidebar();
             this.setTitle(ImpCore.text.search);
-            $('dimpmain_iframe').insert(
+            $('impbase_iframe').insert(
                 new Element('IFRAME', {
                     src: HordeCore.addURLParam(ImpCore.conf.URI_SEARCH, data)
                 }).setStyle({
@@ -854,7 +854,7 @@ var ImpBase = {
         }.bindAsEventListener(this));
 
         container.observe('ViewPort:wait', function() {
-            if ($('dimpmain_folder').visible()) {
+            if ($('impbase_folder').visible()) {
                 HordeCore.notify(ImpCore.text.listmsg_wait, 'horde.warning');
             }
         });
@@ -1629,7 +1629,7 @@ var ImpBase = {
 
         // 'label' will not be set if there has been an error retrieving data
         // from the server.
-        if (!label || !$('dimpmain_folder').visible()) {
+        if (!label || !$('impbase_folder').visible()) {
             return;
         }
 
@@ -2097,7 +2097,7 @@ var ImpBase = {
         // loading but not complete yet and sending this request will cause
         // duplicate info to be returned.
         if (this.view &&
-            $('dimpmain_folder').visible() &&
+            $('impbase_folder').visible() &&
             this.viewport.getMetaData('label')) {
             args = this.addViewportParams();
 
@@ -2300,7 +2300,7 @@ var ImpBase = {
             sc = this.selectedCount();
 
         ImpCore.toggleButtons(
-            $('dimpmain_folder_top').select('DIV.horde-buttonbar A.noselectDisable'),
+            $('impbase_folder_top').select('DIV.horde-buttonbar A.noselectDisable'),
             sc === 0
         );
 
@@ -2532,7 +2532,7 @@ var ImpBase = {
             kc = e.keyCode || e.charCode;
 
         // Only catch keyboard shortcuts in message list view.
-        if (!$('dimpmain_folder').visible()) {
+        if (!$('impbase_folder').visible()) {
             return;
         }
 
@@ -3383,7 +3383,7 @@ var ImpBase = {
             case 'vfolder':
                 e.stop();
                 if (mbox.value() != this.view ||
-                    !$('dimpmain_folder').visible()) {
+                    !$('impbase_folder').visible()) {
                     this.go('mbox', mbox.value());
                 }
                 break;
@@ -3846,7 +3846,7 @@ var ImpBase = {
         });
 
         /* Show page now. */
-        $('dimpLoading').hide();
+        $('impLoading').hide();
         $('horde-page').show();
         this.setSidebarWidth();
 
@@ -3971,13 +3971,13 @@ var ImpBase = {
 
     _onResize: function()
     {
-        if (!$('dimpLoading').visible()) {
+        if (!$('impLoading').visible()) {
             this._sizeFolderlist();
             this.splitbar.setStyle({
                 height: document.viewport.getHeight() + 'px'
             });
-            if ($('dimpmain_iframe').visible()) {
-                $('dimpmain_iframe').down('IFRAME').setStyle({
+            if ($('impbase_iframe').visible()) {
+                $('impbase_iframe').down('IFRAME').setStyle({
                     height: $('horde-page').getHeight() + 'px'
                 });
             }

imp/js/compose.js

@@ -413,11 +413,11 @@ var ImpCompose = {
 
         if (redirect && redirect.visible()) {
             HordeCore.loadingImg('sendingImg', 'redirect', disable);
-            ImpCore.toggleButtons(redirect.select('DIV.dimpActions A'), disable);
+            ImpCore.toggleButtons(redirect.select('DIV.actions A'), disable);
             redirect.setStyle({ cursor: disable ? 'wait': null });
         } else {
             HordeCore.loadingImg('sendingImg', 'composeMessageParent', disable);
-            ImpCore.toggleButtons($('compose').select('DIV.dimpActions A'), disable);
+            ImpCore.toggleButtons($('compose').select('DIV.actions A'), disable);
             [ $('compose') ].invoke(disable ? 'disable' : 'enable');
             if ((sc = this.getSpellChecker())) {
                 sc.disable(disable);
@@ -639,7 +639,7 @@ var ImpCompose = {
     //           reply_lang, reply_recip, reply_list_id, show_editor
     fillForm: function(ob)
     {
-        if (!document.loaded || $('dimpLoading').visible()) {
+        if (!document.loaded || $('impLoading').visible()) {
             this.fillForm.bind(this, ob).delay(0.1);
             return;
         }
@@ -897,7 +897,7 @@ var ImpCompose = {
 
     resizeMsgArea: function(e)
     {
-        if (!document.loaded || $('dimpLoading').visible()) {
+        if (!document.loaded || $('impLoading').visible()) {
             return;
         }
 
@@ -1450,7 +1450,7 @@ var ImpCompose = {
             if (ImpCore.conf.URI_ABOOK) {
                 $('redirect_sendto').down('TD.label SPAN').addClassName('composeAddrbook');
             }
-            $('dimpLoading').hide();
+            $('impLoading').hide();
             $('composeContainer', 'redirect').invoke('show');
 
             this.doTasks();
@@ -1530,7 +1530,7 @@ var ImpCompose = {
             });
         }
 
-        $('dimpLoading').hide();
+        $('impLoading').hide();
         $('composeContainer', 'compose').compact().invoke('show');
 
         this.doTasks();

imp/js/message.js

@@ -316,7 +316,7 @@ var ImpMessage = {
         ImpCore.updateAtcList(this.msg_atc);
         delete this.msg_atc;
 
-        $('dimpLoading').hide();
+        $('impLoading').hide();
         $('msgData').show();
 
         this.resizeWindow();

imp/lib/Dynamic/Helper/Base.php

@@ -39,7 +39,7 @@ public function actionButton(array $params = array())
     {
         $class = '';
         if (!empty($params['icon'])) {
-            $class .= 'dimpaction' . $params['icon'];
+            $class .= 'action' . $params['icon'];
         }
         if (!empty($params['class'])) {
             $class .= ' ' . $params['class'];

imp/templates/dynamic/compose-base.html.php

@@ -1,6 +1,6 @@
 <?php echo $this->status ?>
 
-<div id="dimpLoading">
+<div id="impLoading">
  <?php echo _("Loading...") ?>
 </div>
 

imp/templates/dynamic/compose.html.php

@@ -51,7 +51,7 @@
 
  <div id="writemsg">
   <div class="msgwrite">
-   <div class="dimpOptions">
+   <div class="optionsContainer">
 <?php if ($this->rte): ?>
     <div>
      <label>

imp/templates/dynamic/mailbox.html.php

@@ -1,15 +1,15 @@
-<div id="dimpLoading">
+<div id="impLoading">
  <?php echo _("Loading...") ?>
  <noscript>
   <div class="nojserror"><?php echo _("Error! This application requires javascript to be available and enabled in your browser.") ?></div>
  </noscript>
 </div>
 
 <div id="horde-page" style="display:none">
- <div id="dimpmain">
-  <div id="dimpmain_iframe" style="display:none"></div>
-  <div id="dimpmain_folder" style="display:none">
-   <div id="dimpmain_folder_top">
+ <div id="impbase">
+  <div id="impbase_iframe" style="display:none"></div>
+  <div id="impbase_folder" style="display:none">
+   <div id="impbase_folder_top">
     <div class="horde-buttonbar">
     <ul class="rightFloat">
      <li class="horde-nobutton">
@@ -58,14 +58,14 @@
 
     <div id="searchbar" style="display:none">
      <span class="iconImg closeImg" id="search_close" title="<?php echo _("Clear Search") ?>"></span>
-     <span class="iconImg dimpactionRefresh" id="search_refresh" title="<?php echo _("Refresh Search Results") ?>"></span>
-     <span class="iconImg dimpactionEditsearch" id="search_edit" style="display:none" title="<?php echo _("Edit Search Query") ?>"></span>
+     <span class="iconImg actionRefresh" id="search_refresh" title="<?php echo _("Refresh Search Results") ?>"></span>
+     <span class="iconImg actionEditsearch" id="search_edit" style="display:none" title="<?php echo _("Edit Search Query") ?>"></span>
      <span id="search_time_elapsed" style="display:none"></span>
      <div id="search_label"></div>
     </div>
 
     <div id="viewport_error" style="display:none">
-     <span class="iconImg dimpactionRefresh" id="viewport_error_refresh" title="<?php echo _("Retry") ?>"></span>
+     <span class="iconImg actionRefresh" id="viewport_error_refresh" title="<?php echo _("Retry") ?>"></span>
      <div><?php echo _("Error loading message list.") ?></div>
     </div>
    </div>
@@ -99,7 +99,7 @@
        </ul>
       </div>
       <div id="msgHeaders" style="display:none">
-       <div class="dimpOptions">
+       <div class="optionsContainer">
         <div>
          <span id="msg_newwin_options">
           <span class="iconImg"></span>
@@ -120,7 +120,7 @@
         </div>
         <div>
          <span id="preview_other_opts">
-          <span class="iconImg dimpactionOther"></span>
+          <span class="iconImg actionOther"></span>
           <a><?php echo _("Other Options") ?></a>
         </span>
         </div>

imp/templates/dynamic/message.html.php

@@ -1,6 +1,6 @@
 <?php echo $this->status ?>
 
-<div id="dimpLoading">
+<div id="impLoading">
  <?php echo _("Loading...") ?>
 </div>
 
@@ -35,7 +35,7 @@
  <div class="msgfullread">
   <div class="msgHeaders">
    <div id="msgHeaders">
-    <div class="dimpOptions">
+    <div class="optionsContainer">
 <?php if ($this->show_view_source): ?>
      <div>
       <span id="msg_view_source" title="<?php echo _("View Source") ?>">

imp/themes/default/dynamic/compose.css

@@ -57,17 +57,17 @@
     cursor: default;
     padding: 10px;
 }
-.msgwrite .dimpOptions {
+.msgwrite .optionsContainer {
     padding: 8px 8px 0 0;
 }
-.msgwrite .dimpOptions label {
+.msgwrite .optionsContainer label {
     cursor: pointer;
 }
-.msgwrite .dimpOptions input {
+.msgwrite .optionsContainer input {
     margin-right: 2px;
     min-height: 0px;
 }
-.msgwrite .dimpOptions .horde-popdown {
+.msgwrite .optionsContainer .horde-popdown {
     height: 18px;
     margin-top: -6px;
 }
@@ -308,14 +308,14 @@ span.attachmentImg {
     cursor: pointer;
     margin-top: 6px;
 }
-.dimpactionSend {
+.actionSend {
     background-image: url("../graphics/forward.png");
 }
-.dimpactionDrafts,
-.dimpactionTemplates {
+.actionDrafts,
+.actionTemplates {
     background-image: url("../graphics/drafts.png");
 }
-.dimpactionSpellcheck {
+.actionSpellcheck {
     background-image: url("../graphics/spellcheck.png");
 }
 

imp/themes/default/dynamic/mailbox.css

@@ -314,7 +314,7 @@ div.vpRow div.msgSubject span.flagUser {
 }
 
 /* IFRAMEs */
-#dimpmain_iframe iframe {
+#impbase_iframe iframe {
     border: 0;
     width: 100%;
 }
@@ -513,18 +513,18 @@ span.readonlyImg {
 }
 
 /* Action images. */
-.dimpactionRefresh,
+.actionRefresh,
 #ctx_folderopts_reload span.iconImg {
     background-image: url("../graphics/reload.png");
 }
 .imp-loading {
     background-image: url("../graphics/reload.gif");
 }
-.dimpactionOther,
-.dimpactionSort {
+.actionOther,
+.actionSort {
     background-image: url("../graphics/plus.png");
 }
-.dimpactionEditsearch,
+.actionEditsearch,
 #ctx_mbox_acl span.iconImg {
     background-image: url("../graphics/edit.png");
 }

imp/themes/default/dynamic/message.css

@@ -33,7 +33,7 @@ div.msgfullread span.messagePrintShow {
 
 @media print {
     /* Hide UI elements when printing message in popup window. */
-    div.msgfullread div.dimpOptions,
+    div.msgfullread div.optionsContainer,
     div.msgfullread div.mimePartInfo a.iconImg,
     div.msgfullread span.messagePrintNoShow {
         display: none;