Changeset 45fa64c in github

Timestamp:

Nov 18, 2011 7:51:28 AM (18 months ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.8

Children:

e37e7dd

Parents:

307e684

Message:

• Added About tab in Settings

Files:

• CHANGELOG (modified) (2 diffs)
• program/js/app.js (modified) (2 diffs)
• program/localization/en_US/labels.inc (modified) (2 diffs)
• program/localization/pl_PL/labels.inc (modified) (1 diff)
• program/steps/settings/about.inc (added)
• skins/default/includes/settingstabs.html (modified) (1 diff)
• skins/default/settings.css (modified) (1 diff)
• skins/default/templates/about.html (added)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Added About tab in Settings
+- TinyMCE:
+  - updated to 3.4.6
+  - security issue: removed moxieplayer (embedding flv and mp4 is not supported anymore)
+
+RELEASE 0.7-beta
+----------------
 - Fix handling of HTML form elements in messages (#1485137)
 - Fix regression in setting recipient to self when replying to a Sent message (#1487074)
@@ -18 +25 @@
 - Fix error on opening searched LDAP contact (#1488144)
 - Fix redundant line break in flowed format (#1488146)
-- TinyMCE:
-  - updated to 3.4.6
-  - security issue: removed moxieplayer (embedding flv and mp4 is not supported anymore)
 - Fix IDN address validation issue (#1488137)
 - Fix JS error when dst_active checkbox doesn't exist (#1488133)

program/js/app.js

@@ -156 +156 @@
 
     // enable general commands
-    this.enable_command('logout', 'mail', 'addressbook', 'settings', 'save-pref', 'compose', 'undo', true);
+    this.enable_command('logout', 'mail', 'addressbook', 'settings', 'save-pref', 'compose', 'undo', 'about', true);
 
     if (this.env.permaurl)
@@ -503 +503 @@
       case 'logout':
         this.switch_task(command);
+        break;
+
+      case 'about':
+        location.href = '?_task=settings&_action=about';
         break;
 

program/localization/en_US/labels.inc

@@ -344 +344 @@
 // settings
 $labels['settingsfor']  = 'Settings for';
-
+$labels['about'] = 'About';
 $labels['preferences']  = 'Preferences';
 $labels['userpreferences']  = 'User preferences';
@@ -466 +466 @@
 $labels['undo'] = 'Undo';
 
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['webpage'] = 'Webpage';
+
 // units
 $labels['B'] = 'B';

program/localization/pl_PL/labels.inc

@@ -488 +488 @@
 $labels['isdraft'] = 'To jest kopia robocza wiadomości.';
 $labels['autocompletesingle'] = 'Nie pokazuj alternatywnych adresów przy autouzupełnianiu';
+$labels['plugin'] = 'Wtyczka';
+$labels['version'] = 'Wersja';
+$labels['source'] = 'Źródła';
+$labels['license'] = 'Licencja';
+$labels['webpage'] = 'Strona internetowa';
+$labels['about'] = 'O programie';
 
 ?>

skins/default/includes/settingstabs.html

@@ -3 +3 @@
 <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:container name="tabs" id="tabsbar" />
 <script type="text/javascript"> if (window.rcmail) rcmail.add_onload(rcube_init_settings_tabs); </script>

skins/default/settings.css

@@ -171 +171 @@
   font-family: monospace;
 }
+
+#license
+{
+  margin-left: 20px;
+  left: 20px;
+  width: 500px;
+  height: 250px;
+  background: url(images/watermark.gif) no-repeat center;
+}
+
+#license .sysname
+{
+  font-size: 18px;
+  font-weight: bold;
+}
+
+#license .copyright
+{
+  font-weight: bold;
+}
+
+#license .license,
+#license .links
+{
+  margin-top: 30px;
+}
+
+#pluginlist
+{
+  border: 1px solid #999;
+  margin-left: 20px;
+  top: 300px;
+  left: 20px;
+  width: 500px;
+}
+
+#pluginlist td.source,
+#pluginlist td.license,
+#pluginlist td.version
+{
+  text-align: center;
+}
+
+div.crop
+{
+  overflow: auto;
+}