Kolab Groupware OBS

roundcubemail.spec Changed

debian.changelog Changed

roundcubemail-1.4-alpha4.tar.gz/CHANGELOG -> roundcubemail-1.4-alpha5.tar.gz/CHANGELOG Changed

roundcubemail-1.4-alpha4.tar.gz/logs/errors.log -> roundcubemail-1.4-alpha5.tar.gz/logs/errors.log Changed

roundcubemail-1.4-alpha4.tar.gz/plugins/acl/acl.php -> roundcubemail-1.4-alpha5.tar.gz/plugins/acl/acl.php Changed

roundcubemail-1.4-alpha4.tar.gz/plugins/enigma/lib/enigma_engine.php -> roundcubemail-1.4-alpha5.tar.gz/plugins/enigma/lib/enigma_engine.php Changed

roundcubemail-1.4-alpha4.tar.gz/plugins/enigma/lib/enigma_ui.php -> roundcubemail-1.4-alpha5.tar.gz/plugins/enigma/lib/enigma_ui.php Changed

roundcubemail-1.4-alpha4.tar.gz/plugins/enigma/skins/classic/templates/keys.html -> roundcubemail-1.4-alpha5.tar.gz/plugins/enigma/skins/classic/templates/keys.html Changed

roundcubemail-1.4-alpha4.tar.gz/plugins/enigma/skins/elastic/templates/keys.html -> roundcubemail-1.4-alpha5.tar.gz/plugins/enigma/skins/elastic/templates/keys.html Changed

roundcubemail-1.4-alpha4.tar.gz/plugins/enigma/skins/larry/templates/keys.html -> roundcubemail-1.4-alpha5.tar.gz/plugins/enigma/skins/larry/templates/keys.html Changed

roundcubemail-1.4-alpha4.tar.gz/plugins/help/help.php -> roundcubemail-1.4-alpha5.tar.gz/plugins/help/help.php Changed

roundcubemail-1.4-alpha4.tar.gz/plugins/help/skins/classic/templates/help.html -> roundcubemail-1.4-alpha5.tar.gz/plugins/help/skins/classic/templates/help.html Changed

roundcubemail-1.4-alpha4.tar.gz/plugins/help/skins/elastic/templates/help.html -> roundcubemail-1.4-alpha5.tar.gz/plugins/help/skins/elastic/templates/help.html Changed

roundcubemail-1.4-alpha4.tar.gz/plugins/help/skins/larry/templates/help.html -> roundcubemail-1.4-alpha5.tar.gz/plugins/help/skins/larry/templates/help.html Changed

roundcubemail-1.4-alpha4.tar.gz/plugins/managesieve/Changelog -> roundcubemail-1.4-alpha5.tar.gz/plugins/managesieve/Changelog Changed

roundcubemail-1.4-alpha4.tar.gz/plugins/managesieve/config.inc.php.dist -> roundcubemail-1.4-alpha5.tar.gz/plugins/managesieve/config.inc.php.dist Changed

roundcubemail-1.4-alpha4.tar.gz/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php -> roundcubemail-1.4-alpha5.tar.gz/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php Changed

roundcubemail-1.4-alpha4.tar.gz/plugins/managesieve/managesieve.php -> roundcubemail-1.4-alpha5.tar.gz/plugins/managesieve/managesieve.php Changed

@@ -38,6 +38,13 @@
     {
         $this->rc = rcube::get_instance();
 
+        $this->load_config();
+
+        $allowed_hosts = $this->rc->config->get('managesieve_allowed_hosts');
+        if (!empty($allowed_hosts) && !in_array($_SESSION['storage_host'], (array) $allowed_hosts)) {
+            return;
+        }
+
         // register actions
         $this->register_action('plugin.managesieve', array($this, 'managesieve_actions'));
         $this->register_action('plugin.managesieve-action', array($this, 'managesieve_actions'));
@@ -100,10 +107,8 @@
      */
     function settings_actions($args)
     {
-        $this->load_config();
-
         $vacation_mode = (int) $this->rc->config->get('managesieve_vacation');
-        $forward_mode = (int) $this->rc->config->get('managesieve_forward');
+        $forward_mode  = (int) $this->rc->config->get('managesieve_forward');
 
         // register Filters action
         if ($vacation_mode != 2 && $forward_mode != 2) {
@@ -264,14 +269,12 @@
     public function get_engine($type = null)
     {
         if (!$this->engine) {
-            $this->load_config();
-
             // Add include path for internal classes
             $include_path = $this->home . '/lib' . PATH_SEPARATOR;
             $include_path .= ini_get('include_path');
             set_include_path($include_path);
 
-            $class_name = 'rcube_sieve_' . ($type ?: 'engine');
+            $class_name   = 'rcube_sieve_' . ($type ?: 'engine');
             $this->engine = new $class_name($this);
         }

roundcubemail-1.4-alpha4.tar.gz/plugins/managesieve/skins/classic/templates/managesieve.html -> roundcubemail-1.4-alpha5.tar.gz/plugins/managesieve/skins/classic/templates/managesieve.html Changed

roundcubemail-1.4-alpha4.tar.gz/plugins/managesieve/skins/elastic/templates/managesieve.html -> roundcubemail-1.4-alpha5.tar.gz/plugins/managesieve/skins/elastic/templates/managesieve.html Changed

roundcubemail-1.4-alpha4.tar.gz/plugins/managesieve/skins/larry/templates/managesieve.html -> roundcubemail-1.4-alpha5.tar.gz/plugins/managesieve/skins/larry/templates/managesieve.html Changed

roundcubemail-1.4-alpha4.tar.gz/program/include/rcmail_output_html.php -> roundcubemail-1.4-alpha5.tar.gz/program/include/rcmail_output_html.php Changed

@@ -58,6 +58,18 @@
         'messageprint' => 'printmessage',
     );
 
+    // deprecated names of template objects used before 1.4
+    protected $deprecated_template_objects = array(
+        'addressframe'        => 'contentframe',
+        'messagecontentframe' => 'contentframe',
+        'prefsframe'          => 'contentframe',
+        'folderframe'         => 'contentframe',
+        'identityframe'       => 'contentframe',
+        'responseframe'       => 'contentframe',
+        'keyframe'            => 'contentframe',
+        'filterframe'         => 'contentframe',
+    );
+
     /**
      * Constructor
      */
@@ -81,6 +93,14 @@
         $this->set_env('cookie_path', ini_get('session.cookie_path'));
         $this->set_env('cookie_secure', filter_var(ini_get('session.cookie_secure'), FILTER_VALIDATE_BOOLEAN));
 
+        // Easy way to change skin via GET argument, for developers
+        if ($this->devel_mode && !empty($_GET['skin']) && preg_match('/^[a-z0-9-_]+$/i', $_GET['skin'])) {
+            if ($this->check_skin($_GET['skin'])) {
+                $this->set_skin($_GET['skin']);
+                $this->app->user->save_prefs(array('skin' => $_GET['skin']));
+            }
+        }
+
         // load and setup the skin
         $this->set_skin($this->config->get('skin'));
         $this->set_assets_path($this->config->get('assets_path'), $this->config->get('assets_dir'));
@@ -131,6 +151,11 @@
             'charsetselector' => array($this, 'charset_selector'),
             'aboutcontent'    => array($this, 'about_content'),
         ));
+
+        // set blankpage (watermark) url
+        $blankpage = $this->config->get('blankpage_url', '/watermark.html');
+        $blankpage = $this->abs_url($blankpage);
+        $this->set_env('blankpage', $blankpage);
     }
 
     /**
@@ -496,7 +521,7 @@
 
     /**
      * Send the request output to the client.
-     * This will either parse a skin tempalte or send an AJAX response
+     * This will either parse a skin template.
      *
      * @param string  $templ Template name
      * @param boolean $exit  True if script should terminate (default)
@@ -1029,6 +1054,45 @@
     }
 
     /**
+     * Parse variable strings
+     *
+     * @param string $type Variable type (env, config etc)
+     * @param string $name Variable name
+     *
+     * @return mixed Variable value
+     */
+    protected function parse_variable($type, $name)
+    {
+        $value = '';
+
+        switch ($type) {
+            case 'env':
+                $value = $this->env[$name];
+                break;
+            case 'config':
+                $value = $this->config->get($name);
+                if (is_array($value) && $value[$_SESSION['storage_host']]) {
+                    $value = $value[$_SESSION['storage_host']];
+                }
+                break;
+            case 'request':
+                $value = rcube_utils::get_input_value($name, rcube_utils::INPUT_GPC);
+                break;
+            case 'session':
+                $value = $_SESSION[$name];
+                break;
+            case 'cookie':
+                $value = htmlspecialchars($_COOKIE[$name], ENT_COMPAT | ENT_HTML401, RCUBE_CHARSET);
+                break;
+            case 'browser':
+                $value = $this->browser->{$name};
+                break;
+        }
+
+        return $value;
+    }
+
+    /**
      * Search for special tags in input and replace them
      * with the appropriate content
      *
@@ -1175,6 +1239,11 @@
                 $object  = strtolower($attrib['name']);
                 $content = '';
 
+                // correct deprecated object names
+                if ($this->deprecated_template_objects[$object]) {
+                    $object = $this->deprecated_template_objects[$object];
+                }
+
                 // we are calling a class/method
                 if (($handler = $this->object_handlers[$object]) && is_array($handler)) {
                     if (is_callable($handler)) {
@@ -1246,6 +1315,18 @@
                     $title .= $this->get_pagetitle();
                     $content = html::quote($title);
                 }
+                else if ($object == 'contentframe') {
+                    if (empty($attrib['id'])) {
+                        $attrib['id'] = 'rcm' . $this->env['task'] . 'frame';
+                    }
+
+                    // parse variables
+                    if (preg_match('/^(config|env):([a-z0-9_]+)$/i', $attrib['src'], $matches)) {
+                        $attrib['src'] = $this->parse_variable($matches[1], $matches[2]);
+                    }
+
+                    $content = $this->frame($attrib, true);
+                }
 
                 // exec plugin hooks for this template object
                 $hook = $this->app->plugins->exec_hook("template_object_$object", $attrib + array('content' => $content));
@@ -1276,32 +1357,7 @@
             // return variable
             case 'var':
                 $var = explode(':', $attrib['name']);
-                $name = $var[1];
-                $value = '';
-
-                switch ($var[0]) {
-                    case 'env':
-                        $value = $this->env[$name];
-                        break;
-                    case 'config':
-                        $value = $this->config->get($name);
-                        if (is_array($value) && $value[$_SESSION['storage_host']]) {
-                            $value = $value[$_SESSION['storage_host']];
-                        }
-                        break;
-                    case 'request':
-                        $value = rcube_utils::get_input_value($name, rcube_utils::INPUT_GPC);
-                        break;
-                    case 'session':
-                        $value = $_SESSION[$name];
-                        break;
-                    case 'cookie':
-                        $value = htmlspecialchars($_COOKIE[$name], ENT_COMPAT | ENT_HTML401, RCUBE_CHARSET);
-                        break;
-                    case 'browser':
-                        $value = $this->browser->{$name};
-                        break;
-                }
+                $value = $this->parse_variable($var[0], $var[1]);
 
                 if (is_array($value)) {
                     $value = implode(', ', $value);
@@ -1817,7 +1873,6 @@
         // register as 'contentframe' object
         if ($is_contentframe || $attrib['contentframe']) {
             $this->set_env('contentframe', $attrib['contentframe'] ? $attrib['contentframe'] : $attrib['name']);
-            $this->set_env('blankpage', $this->asset_url($attrib['src']));
         }
 
         return html::iframe($attrib);
@@ -2135,10 +2190,10 @@
             ));
 
             $out = html::div(array(
-                'role'            => 'search',
-                'aria-labelledby' => $attrib['label'] ? 'aria-label-' . $attrib['label'] : null,
-                'class'           => $attrib['wrapper'],
-            ), "$header$out\n$options_button\n$reset_button\n$search_button");
+                    'role'            => 'search',
+                    'aria-labelledby' => $attrib['label'] ? 'aria-label-' . $attrib['label'] : null,
+                    'class'           => $attrib['wrapper'],
+                ), "$header$out\n$reset_button\n$options_button\n$search_button");
         }
 
         return $out;

roundcubemail-1.4-alpha4.tar.gz/program/js/app.js -> roundcubemail-1.4-alpha5.tar.gz/program/js/app.js Changed

roundcubemail-1.4-alpha4.tar.gz/program/js/tinymce/langs/es.js -> roundcubemail-1.4-alpha5.tar.gz/program/js/tinymce/langs/es.js Changed

roundcubemail-1.4-alpha4.tar.gz/program/lib/Roundcube/rcube_message.php -> roundcubemail-1.4-alpha5.tar.gz/program/lib/Roundcube/rcube_message.php Changed

@@ -854,17 +854,16 @@
                     ) {
                         $this->add_part($mail_part, 'inline');
                     }
-                    // regular attachment with valid content type
-                    // (content-type name regexp according to RFC4288.4.2)
-                    else if (preg_match('/^[a-z0-9!#$&.+^_-]+\/[a-z0-9!#$&.+^_-]+$/i', $part_mimetype)) {
-                        $this->add_part($mail_part, 'attachment');
-                    }
-                    // attachment with invalid content type
-                    // replace malformed content type with application/octet-stream (#1487767)
-                    else if ($mail_part->filename) {
-                        $mail_part->ctype_primary   = 'application';
-                        $mail_part->ctype_secondary = 'octet-stream';
-                        $mail_part->mimetype        = 'application/octet-stream';
+
+                    // Any non-inline attachment
+                    if (!preg_match('/^inline/i', $mail_part->disposition)) {
+                        // Content-Type name regexp according to RFC4288.4.2
+                        if (!preg_match('/^[a-z0-9!#$&.+^_-]+\/[a-z0-9!#$&.+^_-]+$/i', $part_mimetype)) {
+                            // replace malformed content type with application/octet-stream (#1487767)
+                            $mail_part->ctype_primary   = 'application';
+                            $mail_part->ctype_secondary = 'octet-stream';
+                            $mail_part->mimetype        = 'application/octet-stream';
+                        }
 
                         $this->add_part($mail_part, 'attachment');
                     }

roundcubemail-1.4-alpha4.tar.gz/program/localization/en_US/labels.inc -> roundcubemail-1.4-alpha5.tar.gz/program/localization/en_US/labels.inc Changed

roundcubemail-1.4-alpha4.tar.gz/program/steps/addressbook/func.inc -> roundcubemail-1.4-alpha5.tar.gz/program/steps/addressbook/func.inc Changed

roundcubemail-1.4-alpha4.tar.gz/program/steps/mail/func.inc -> roundcubemail-1.4-alpha5.tar.gz/program/steps/mail/func.inc Changed

roundcubemail-1.4-alpha4.tar.gz/program/steps/settings/folders.inc -> roundcubemail-1.4-alpha5.tar.gz/program/steps/settings/folders.inc Changed

roundcubemail-1.4-alpha4.tar.gz/program/steps/settings/func.inc -> roundcubemail-1.4-alpha5.tar.gz/program/steps/settings/func.inc Changed

roundcubemail-1.4-alpha4.tar.gz/program/steps/settings/identities.inc -> roundcubemail-1.4-alpha5.tar.gz/program/steps/settings/identities.inc Changed

roundcubemail-1.4-alpha4.tar.gz/program/steps/settings/responses.inc -> roundcubemail-1.4-alpha5.tar.gz/program/steps/settings/responses.inc Changed

roundcubemail-1.4-alpha4.tar.gz/skins/classic/templates/addressbook.html -> roundcubemail-1.4-alpha5.tar.gz/skins/classic/templates/addressbook.html Changed

roundcubemail-1.4-alpha4.tar.gz/skins/classic/templates/compose.html -> roundcubemail-1.4-alpha5.tar.gz/skins/classic/templates/compose.html Changed

roundcubemail-1.4-alpha4.tar.gz/skins/classic/templates/folders.html -> roundcubemail-1.4-alpha5.tar.gz/skins/classic/templates/folders.html Changed

roundcubemail-1.4-alpha4.tar.gz/skins/classic/templates/identities.html -> roundcubemail-1.4-alpha5.tar.gz/skins/classic/templates/identities.html Changed

roundcubemail-1.4-alpha4.tar.gz/skins/classic/templates/mail.html -> roundcubemail-1.4-alpha5.tar.gz/skins/classic/templates/mail.html Changed

roundcubemail-1.4-alpha4.tar.gz/skins/classic/templates/responses.html -> roundcubemail-1.4-alpha5.tar.gz/skins/classic/templates/responses.html Changed

roundcubemail-1.4-alpha4.tar.gz/skins/classic/templates/settings.html -> roundcubemail-1.4-alpha5.tar.gz/skins/classic/templates/settings.html Changed

roundcubemail-1.4-alpha4.tar.gz/skins/elastic/styles/colors.less -> roundcubemail-1.4-alpha5.tar.gz/skins/elastic/styles/colors.less Changed

roundcubemail-1.4-alpha4.tar.gz/skins/elastic/styles/widgets/common.less -> roundcubemail-1.4-alpha5.tar.gz/skins/elastic/styles/widgets/common.less Changed

roundcubemail-1.4-alpha4.tar.gz/skins/elastic/styles/widgets/dialogs.less -> roundcubemail-1.4-alpha5.tar.gz/skins/elastic/styles/widgets/dialogs.less Changed

roundcubemail-1.4-alpha4.tar.gz/skins/elastic/styles/widgets/forms.less -> roundcubemail-1.4-alpha5.tar.gz/skins/elastic/styles/widgets/forms.less Changed

@@ -619,20 +619,25 @@
 
 td.editfield { width: 99%;  /* TODO */ }
 
-
-ul.proplist {
+@proplist-record-height: 2rem;
+.proplist {
     margin-bottom: 0;
 
-    @media screen and (min-width: (@screen-width-bs-phone + 1px)) {
+    .formcontent > &,
+    fieldset > & {
         padding-left: 0;
     }
 
     li {
         list-style-type: none;
-        line-height: 2.4rem;
+        line-height: @proplist-record-height;
         margin-bottom: .25rem;
         display: flex;
 
+        &:last-child {
+            margin-bottom: 0;
+        }
+
         input[type=radio] {
             vertical-align: middle;
             margin-right: .5em;
@@ -644,16 +649,22 @@
 
         label {
             margin: 0;
+            line-height: @proplist-record-height;
         }
 
         .icon-checkbox {
-            height: 2.4rem !important;
+            height: @proplist-record-height;
             margin-left: -1.2em;
 
             & + label {
-                height: 2rem;
+                height: @proplist-record-height;
                 margin-right: .5rem;
-                padding: 0;
+                padding: 0 !important;
+                line-height: 1.25;
+
+                html.touch &:before {
+                    line-height: 1.1;
+                }
             }
         }
 
@@ -664,7 +675,6 @@
     }
 }
 
-
 .checklist {
     .form-check-input + label {
         margin-right: .25rem;

roundcubemail-1.4-alpha4.tar.gz/skins/elastic/styles/widgets/jqueryui.less -> roundcubemail-1.4-alpha5.tar.gz/skins/elastic/styles/widgets/jqueryui.less Changed

roundcubemail-1.4-alpha4.tar.gz/skins/elastic/styles/widgets/mail.less -> roundcubemail-1.4-alpha5.tar.gz/skins/elastic/styles/widgets/mail.less Changed

@@ -19,10 +19,30 @@
     margin-bottom: 1rem;
 
     .subject {
-        .overflow-ellipsis;
+        display: flex;
         font-size: 1.5rem;
         font-weight: bold;
         white-space: nowrap;
+
+        a.extwin {
+            margin-left: .25rem;
+
+            &:before {
+                &:extend(.font-icon-class);
+                font-size: 75%;
+                line-height: 1.5;
+                margin: 0;
+                content: @fa-var-external-link-square-alt;
+            }
+        }
+
+        & > span {
+            .overflow-ellipsis;
+        }
+
+        span.inner {
+            display: none;
+        }
     }
 
     .short-header {
@@ -56,25 +76,16 @@
                 margin-right: .5rem;
                 text-decoration: none;
                 white-space: nowrap;
-                line-height: 1.5;
                 display: inline-block;
 
                 &:before {
                     &:extend(.font-icon-class);
-                    display: inline-block;
-                    float: none;
-                }
-
-                &.extwin:before {
-                    content: @fa-var-external-link-square-alt;
-                }
-
-                &.headers:before {
-                    content: @fa-var-wrench;
+                    height: 1.5rem;
+                    line-height: 1.3;
                 }
 
                 &.envelope:before {
-                    .font-icon-regular(@fa-var-envelope);
+                    content: @fa-var-envelope;
                 }
 
                 &.html:before {
@@ -96,6 +107,11 @@
             padding: .25rem 0 !important;
         }
     }
+
+    a.extwin,
+    a.headers {
+        text-decoration: none;
+    }
 }
 
 #message-content {

roundcubemail-1.4-alpha4.tar.gz/skins/elastic/styles/widgets/toolbar.less -> roundcubemail-1.4-alpha5.tar.gz/skins/elastic/styles/widgets/toolbar.less Changed

@@ -47,7 +47,6 @@
 
         &:before {
             &:extend(.font-icon-class);
-            display: inline;
             float: none;
             margin: 0;
             line-height: 1.75;
@@ -249,6 +248,7 @@
 
         .pagenav-text {
             .overflow-ellipsis;
+            color: @color-list-pagenav;
             flex-grow: 4;
             font-size: 80%;
             white-space: nowrap;
@@ -291,6 +291,12 @@
         }
     }
 
+    &.footer.small {
+        a.button:before {
+            height: auto; // for Chrome
+        }
+    }
+
     &.content-frame-navigation.hide-nav-buttons {
         a.next,
         a.prev {
@@ -756,15 +762,16 @@
 
 .searchbar {
     height: @layout-searchbar-height;
+    min-height: @layout-searchbar-height; // because of Flexbox
     line-height: @layout-searchbar-height;
     background-color: @color-searchbar-background;
     border-bottom: 1px solid @color-list-border;
     display: flex;
     align-items: center;
     white-space: nowrap;
-    padding: 0 .5rem;
     overflow: hidden;
     position: relative;
+    padding-right: .5rem;
 
     form {
         flex: 1;
@@ -774,6 +781,8 @@
             &:extend(.font-icon-class);
             content: @fa-var-search;
             height: @layout-searchbar-height;
+            color: @color-list-pagenav;
+            margin: 0 0 0 .75rem;
         }
     }
 
@@ -787,23 +796,22 @@
     a.button {
         height: @layout-searchbar-height;
         min-width: auto;
+        color: @color-toolbar-button;
 
         &:before {
             &:extend(.font-icon-class);
         }
 
-
         &.options {
             &:before {
-                content: @fa-var-filter;
-                font-size: 1em;
+                content: @fa-var-angle-down;
+                line-height: 1.25;
+                width: 1em;
             }
         }
 
         &.reset {
             display: none;
-            position: absolute;
-            right: .5rem;
 
             &:before {
                 content: @fa-var-times;
@@ -811,10 +819,6 @@
             }
         }
 
-        &.options + .reset {
-            right: 2.5rem;
-        }
-
         &.search {
             display: none;
         }
@@ -825,10 +829,6 @@
     }
 
     &.active {
-        form:before {
-            color: @color-searchbar-icon-active;
-        }
-
         a.button.reset {
             display: inline;
         }
@@ -836,8 +836,6 @@
 
     &.open a.button.options:before {
         content: @fa-var-angle-up;
-        font-size: 1.25em;
-        line-height: 1.25;
     }
 }
 
@@ -847,10 +845,6 @@
     }
 
     ul.proplist {
-        li {
-            margin: 0;
-        }
-
         & + div {
             margin-top: 1rem;
         }

roundcubemail-1.4-alpha4.tar.gz/skins/elastic/templates/addressbook.html -> roundcubemail-1.4-alpha5.tar.gz/skins/elastic/templates/addressbook.html Changed

roundcubemail-1.4-alpha4.tar.gz/skins/elastic/templates/compose.html -> roundcubemail-1.4-alpha5.tar.gz/skins/elastic/templates/compose.html Changed

roundcubemail-1.4-alpha4.tar.gz/skins/elastic/templates/folders.html -> roundcubemail-1.4-alpha5.tar.gz/skins/elastic/templates/folders.html Changed

roundcubemail-1.4-alpha4.tar.gz/skins/elastic/templates/identities.html -> roundcubemail-1.4-alpha5.tar.gz/skins/elastic/templates/identities.html Changed

roundcubemail-1.4-alpha4.tar.gz/skins/elastic/templates/mail.html -> roundcubemail-1.4-alpha5.tar.gz/skins/elastic/templates/mail.html Changed

roundcubemail-1.4-alpha4.tar.gz/skins/elastic/templates/message.html -> roundcubemail-1.4-alpha5.tar.gz/skins/elastic/templates/message.html Changed

@@ -21,6 +21,10 @@
 					<span class="voice"><roundcube:label name="subject" />: </span>
 					<roundcube:object name="messageHeaders" valueOf="subject" />
 				</span>
+				<roundcube:if condition="!env:message_context && !env:extwin">
+					<roundcube:button command="extwin" type="link" class="extwin" innerClass="inner"
+						label="openinextwin" data-hidden="small" />
+				<roundcube:endif />
 			</h2>
 			<div class="short-header">
 				<roundcube:object name="contactphoto" class="contactphoto" placeholder="/images/contactpic.png" />
@@ -28,15 +32,11 @@
 					<roundcube:object name="messageSummary" addicon="virtual" class="header-subject" />
 					<div class="message-partheaders hidden">
 						<roundcube:object name="messageHeaders" class="headers-table" addicon="virtual" exclude="subject" max="10" />
+						<a href="#all-headers" class="headers" onclick="return UI.headers_dialog()"><roundcube:label name="allheaders" /></a>
 					</div>
 					<div class="header-links">
-						<a href="#headers" class="envelope" onclick="return UI.headers_show(this)"><roundcube:label name="envelope" /></a>
-						<a href="#all-headers" class="headers" onclick="return UI.headers_dialog()"><roundcube:label name="headers" /></a>
+						<a href="#headers" class="envelope" onclick="return UI.headers_show(this)"><roundcube:label name="details" /></a>
 						<roundcube:add_label name="arialabelmessageheaders" />
-						<roundcube:if condition="!env:message_context && !env:extwin">
-							<roundcube:button command="extwin" type="link" class="extwin" innerClass="inner"
-								label="openinextwin" data-hidden="small" />
-						<roundcube:endif />
 						<roundcube:if condition="env:optional_format=='text'" />
 							<roundcube:button command="change-format" prop="text" type="link" class="plain" innerClass="inner"
 								title="changeformattext" label="plaintoggle" />

roundcubemail-1.4-alpha4.tar.gz/skins/elastic/templates/responses.html -> roundcubemail-1.4-alpha5.tar.gz/skins/elastic/templates/responses.html Changed

roundcubemail-1.4-alpha4.tar.gz/skins/elastic/templates/settings.html -> roundcubemail-1.4-alpha5.tar.gz/skins/elastic/templates/settings.html Changed

roundcubemail-1.4-alpha4.tar.gz/skins/elastic/ui.js -> roundcubemail-1.4-alpha5.tar.gz/skins/elastic/ui.js Changed

@@ -359,8 +359,9 @@
      */
     function create_cloned_button(target, menu_button, add_class)
     {
-        var button = $('<a>'),
-            target_id = target.attr('id'),
+        var popup, click = true,
+            button = $('<a>'),
+            target_id = target.attr('id') || new Date().getTime(),
             button_id = target_id + '-clone',
             btn_class = target[0].className + (add_class ? ' ' + add_class : '');
 
@@ -368,10 +369,18 @@
             btn_class = $.trim(btn_class.replace('btn-primary', 'primary').replace(/(btn[a-z-]*|button|disabled)/g, ''))
             btn_class += ' button disabled';
         }
+        else if (popup = target.data('popup')) {
+            button.data('popup', popup).data('toggle-button', target.data('toggle-button'));
+            popup_init(button[0]);
+            click = false;
+        }
+
+        button.attr({id: button_id, href: '#', 'class': btn_class})
+            .append($('<span class="inner">').text(target.text()));
 
-        button.attr({'onclick': '', id: button_id, href: '#', 'class': btn_class})
-            .append($('<span class="inner">').text(target.text()))
-            .on('click', function(e) { target.click(); });
+        if (click) {
+            button.on('click', function(e) { target.click(); });
+        }
 
         if (is_framed && !menu_button) {
             button.data('target', target);
@@ -481,7 +490,10 @@
                         button.prependTo(toolbar).wrap('<li role="menuitem">');
                     }
                     else {
-                        button.appendTo(toolbar).addClass('icon toolbar-button');
+                        button.appendTo(toolbar).addClass('icon');
+                        if (!parent.is('.sidebar')) {
+                            button.addClass('toolbar-button');
+                        }
                     }
                 }
 
@@ -981,14 +993,11 @@
             env.content_lock = false;
         };
 
-        // display the list widget after 'list' and 'listgroup' commands
         var common_list_handler = function(e) {
-            if (mode != 'large' && !env.content_lock && e.list) {
+            if (mode != 'large' && !env.content_lock && e.force) {
                 show_list();
             }
 
-            env.content_lock = false;
-
             // display current folder name in list header
             if (e.title) {
                 $('.header > .header-title', layout.list).text(e.title);
@@ -998,10 +1007,6 @@
         var list_handler = function(e) {
             var args = {};
 
-            if (rcmail.env.task == 'addressbook' || (rcmail.env.task == 'mail' && !rcmail.env.action)) {
-                args.list = true;
-            }
-
             // display current folder name in list header
             if (rcmail.env.task == 'mail' && !rcmail.env.action) {
                 var name = $.type(e) == 'string' ? e : rcmail.env.mailbox,
@@ -1037,7 +1042,6 @@
             .addEventListener('afterlistsearch', list_handler)
             // plugins
             .addEventListener('show-list', function(e) {
-                e.list = true;
                 common_list_handler(e);
             })
             .addEventListener('show-content', function(e) {
@@ -1527,7 +1531,9 @@
     {
         if (show) {
             if (mode == 'phone') {
-                $('<div id="menu-overlay" class="popover-overlay">').appendTo('body');
+                $('<div id="menu-overlay" class="popover-overlay">')
+                    .on('click', function() { app_menu(false); })
+                    .appendTo('body');
 
                 if (!env.menu_initialized) {
                     env.menu_initialized = true;
@@ -1943,6 +1949,40 @@
                     }
                 });
 
+                // On keyboard event focus the first (active) entry and enable keyboard navigation
+                if ($(item).data('event') == 'key') {
+                    popover.off('keydown.popup').on('keydown.popup', 'a.active', function(e) {
+                        var entry, node, mode = 'next';
+
+                        switch (e.which) {
+                            case 27: // ESC
+                            case 9:  // TAB
+                                $(item).popover('toggle').focus();
+                                return false;
+
+                            case 13: // ENTER
+                            case 32: // SPACE
+                                $(this).trigger('click').data('event', 'key');
+                                return false; // for IE
+
+                            case 38: // ARROW-UP
+                            case 63232:
+                                mode = 'previous';
+                            case 40: // ARROW-DOWN
+                            case 63233:
+                                entry = e.target.parentNode;
+                                while (entry = entry[mode + 'Sibling']) {
+                                    if (node = $(entry).children('.active')[0]) {
+                                        node.focus();
+                                        break;
+                                    }
+                                }
+                        }
+                    });
+
+                    popover.find('a.active:first').focus();
+                }
+
                 if (popup_id && menus[popup_id]) {
                     menus[popup_id].transitioning = false;
                 }
@@ -1987,10 +2027,23 @@
                     delete menus[popup_id];
                 }
             })
-            .on('keypress', function(event) {
-                // Close the popup on ESC key
-                if (event.originalEvent.keyCode == 27) {
-                    $(item).popover('hide');
+            // Because Bootstrap does not provide originalEvent in show/shown events
+            // we have to handle that by our own using click and keydown handlers
+            .on('click', function() {
+                $(this).data('event', 'mouse');
+            })
+            .on('keydown', function(e) {
+                switch (e.originalEvent.which) {
+                    case 13:
+                    case 32:
+                        // Open the popup on ENTER or SPACE
+                        e.preventDefault();
+                        $(this).data('event', 'key').popover('toggle');
+                        break;
+                    case 27:
+                        // Close the popup on ESC key
+                        $(this).popover('hide');
+                        break;
                 }
             });
 
@@ -2895,9 +2948,17 @@
             }
 
             $('option', select).each(function() {
-                var link = $('<a href="#">').text($(this).text())
-                    .data('value', this.value)
-                    .addClass(this.disabled ? 'disabled' : 'active' + (this.value == value ? ' selected' : ''));
+                var label = $(this).text(),
+                    link = $('<a href="#">')
+                        .data('value', this.value)
+                        .addClass(this.disabled ? 'disabled' : 'active' + (this.value == value ? ' selected' : ''));
+
+                if (label.length) {
+                    link.text(label);
+                }
+                else {
+                    link.html('&nbsp;'); // link can't be empty
+                }
 
                 items.push($('<li>').append(link));
             });
@@ -2906,12 +2967,15 @@
                 .append(items)
                 .data('button', select[0]) // needed for dropdown closing code
                 .on('click', 'a.active', function() {
-                    select.val($(this).data('value')).change();
-                    return close_func();
+                    // first close the list, then update the select, the order is important
+                    //for cases when the select might be removed in change event (datepicker)
+                    var val = $(this).data('value'), ret = close_func();
+                    select.val(val).change();
+                    return ret;
                 })
                 .on('keydown', 'a.active', function(e) {
                     var item, node, mode = 'next';
-                    // Close popup on ESC key
+
                     switch (e.which) {
                         case 27: // ESC

roundcubemail-1.4-alpha4.tar.gz/skins/larry/templates/addressbook.html -> roundcubemail-1.4-alpha5.tar.gz/skins/larry/templates/addressbook.html Changed

roundcubemail-1.4-alpha4.tar.gz/skins/larry/templates/compose.html -> roundcubemail-1.4-alpha5.tar.gz/skins/larry/templates/compose.html Changed

roundcubemail-1.4-alpha4.tar.gz/skins/larry/templates/folders.html -> roundcubemail-1.4-alpha5.tar.gz/skins/larry/templates/folders.html Changed

roundcubemail-1.4-alpha4.tar.gz/skins/larry/templates/identities.html -> roundcubemail-1.4-alpha5.tar.gz/skins/larry/templates/identities.html Changed

roundcubemail-1.4-alpha4.tar.gz/skins/larry/templates/mail.html -> roundcubemail-1.4-alpha5.tar.gz/skins/larry/templates/mail.html Changed

roundcubemail-1.4-alpha4.tar.gz/skins/larry/templates/responses.html -> roundcubemail-1.4-alpha5.tar.gz/skins/larry/templates/responses.html Changed

roundcubemail-1.4-alpha4.tar.gz/skins/larry/templates/settings.html -> roundcubemail-1.4-alpha5.tar.gz/skins/larry/templates/settings.html Changed

roundcubemail-1.4-alpha4.tar.gz/temp/js_cache/tinymce-langs-4.5.8.tmp -> roundcubemail-1.4-alpha5.tar.gz/temp/js_cache/tinymce-langs-4.5.8.tmp Changed

roundcubemail.dsc Changed

Changes of Revision 104