Generate settings tabs with a template object 'settingstabs' and let plugins register themselves there using the 'settings_actions' hook

4 files changed, 6 insertions, 10 deletions

diff --git a/skins/classic/functions.js b/skins/classic/functions.js
index af561c37b..4ad13136f 100644
--- a/skins/classic/functions.js
+++ b/skins/classic/functions.js
@@ -10,7 +10,7 @@ function rcube_init_settings_tabs()
 {
   var el, cl, container = $('#tabsbar'),
     last_tab = $('span:last', container),
-    tab = '#settingstabdefault',
+    tab = '#settingstabpreferences',
     action = window.rcmail && rcmail.env.action ? rcmail.env.action : null;
 
   // move About tab to the end
@@ -22,7 +22,7 @@ function rcube_init_settings_tabs()
 
   // get selected tab
   if (action)
-    tab = '#settingstab' + (action == 'preferences' ? 'default' : (action.indexOf('identity')>0 ? 'identities' : action.replace(/\./g, '')));
+    tab = '#settingstab' + (action.indexOf('identity')>0 ? 'identities' : action.replace(/\./g, ''));
 
   $(tab).addClass('tablink-selected');
   $('a', tab).removeAttr('onclick').click(function() { return false; });
diff --git a/skins/classic/includes/settingstabs.html b/skins/classic/includes/settingstabs.html
index 0aea80b67..a47db2274 100644
--- a/skins/classic/includes/settingstabs.html
+++ b/skins/classic/includes/settingstabs.html
@@ -1,8 +1,6 @@
 <div id="tabsbar">
-<span id="settingstabdefault" class="tablink"><roundcube:button command="preferences" type="link" label="preferences" title="editpreferences" /></span>
-<span id="settingstabfolders" class="tablink"><roundcube:button command="folders" type="link" label="folders" title="managefolders" class="tablink" /></span>
-<span id="settingstabidentities" class="tablink"><roundcube:button command="identities" type="link" label="identities" title="manageidentities" class="tablink" /></span>
-<span id="settingstababout" class="tablink"><roundcube:button command="about" type="link" label="about" title="about" class="tablink" /></span>
+<roundcube:object name="settingstabs" class="tablink" selClass="tablink-selected" />
 <roundcube:container name="tabs" id="tabsbar" />
+<span id="settingstababout" class="tablink"><roundcube:button command="about" type="link" label="about" title="about" class="tablink" /></span>
 <script type="text/javascript"> if (window.rcmail) rcmail.add_onload(rcube_init_settings_tabs); </script>
 </div>
diff --git a/skins/larry/includes/header.html b/skins/larry/includes/header.html
index 5a934d89b..69e8b8aa6 100644
--- a/skins/larry/includes/header.html
+++ b/skins/larry/includes/header.html
@@ -29,7 +29,7 @@
 	<roundcube:button command="logout" label="logout" class="button-logout" classSel="button-logout" innerClass="button-inner" />
 	<span class="minmodetoggle"></span>
 	</div>
-	<roundcube:object name="logo" src="/images/roundcube_logo.png" id="toplogo" alt="Logo" onclick="rcmail.command('switch-task','mail');return false;" />
+	<roundcube:object name="logo" src="/images/roundcube_logo.png" id="toplogo" alt="Logo" onclick="if(window.rcmail)rcmail.command('switch-task','mail')" />
 </div>
 <roundcube:endif />
 
diff --git a/skins/larry/includes/settingstabs.html b/skins/larry/includes/settingstabs.html
index bb26fc6a6..e62695848 100644
--- a/skins/larry/includes/settingstabs.html
+++ b/skins/larry/includes/settingstabs.html
@@ -1,9 +1,7 @@
 <div id="settings-sections" class="uibox listbox">
 <h2 class="boxtitle"><roundcube:label name="settings" /></h2>
 <div id="settings-tabs" class="scroller">
-	<span id="settingstabpreferences" class="listitem preferences"><roundcube:button command="preferences" type="link" label="preferences" title="editpreferences" /></span>
-	<span id="settingstabfolders" class="listitem folders"><roundcube:button command="folders" type="link" label="folders" title="managefolders" /></span>
-	<span id="settingstabidentities" class="listitem identities"><roundcube:button command="identities" type="link" label="identities" title="manageidentities" /></span>
+	<roundcube:object name="settingstabs" class="listitem" />
 	<roundcube:container name="tabs" id="settings-tabs" />
 </div>
 </div>