diff options
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | program/include/rcmail_output_html.php | 10 | ||||
| -rw-r--r-- | skins/classic/common.css | 4 | ||||
| -rw-r--r-- | skins/classic/templates/login.html | 6 | ||||
| -rw-r--r-- | skins/larry/templates/login.html | 6 |
5 files changed, 17 insertions, 11 deletions
@@ -1,7 +1,6 @@ CHANGELOG Roundcube Webmail =========================== -- Fix opening compose screen in new window after saving as draft (#1489643) - Added toolbar button to move message in message view - Improve UI integration of ACL settings - Fix directories check in Installer on Windows (#1489576) @@ -11,6 +10,7 @@ CHANGELOG Roundcube Webmail - Fix invalid X-Draft-Info on forwarded message draft (#1489587) - Fix regression in handling of 'attachments' result in message_compose hook (#1489627) - Fix issue where msgexport.sh printed the message to STDOUT instead of a file (#1489634) +- Fix opening compose screen in new window after saving as draft (#1489643) RELEASE 1.0-rc -------------- diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php index 45cb9f0d9..a23b8405e 100644 --- a/program/include/rcmail_output_html.php +++ b/program/include/rcmail_output_html.php @@ -1629,6 +1629,12 @@ class rcmail_output_html extends rcmail_output $out .= $input_host->show(); } + if (rcube_utils::get_boolean($attrib['submit'])) { + $submit = new html_inputfield(array('type' => 'submit', 'id' => 'rcmloginsubmit', + 'class' => 'button mainaction', 'value' => $this->app->gettext('login'))); + $out .= html::p('formbuttons', $submit->show()); + } + // surround html output with a form tag if (empty($attrib['form'])) { $out = $this->form_tag(array('name' => $form_name, 'method' => 'post'), $out); @@ -1691,9 +1697,9 @@ class rcmail_output_html extends rcmail_output // add form tag around text field if (empty($attrib['form'])) { $out = $this->form_tag(array( - 'name' => "rcmqsearchform", + 'name' => "rcmqsearchform", 'onsubmit' => self::JS_OBJECT_NAME . ".command('search'); return false", - 'style' => "display:inline"), + 'style' => "display:inline"), $out); } diff --git a/skins/classic/common.css b/skins/classic/common.css index b1ec7c7df..ec58af0a4 100644 --- a/skins/classic/common.css +++ b/skins/classic/common.css @@ -882,6 +882,10 @@ font.bold font-weight: bold; } +.formbuttons +{ + text-align: center; +} /***** onclick menu list *****/ diff --git a/skins/classic/templates/login.html b/skins/classic/templates/login.html index 2dacd48ff..8b549df0d 100644 --- a/skins/classic/templates/login.html +++ b/skins/classic/templates/login.html @@ -16,11 +16,9 @@ <div class="boxcontent"> <roundcube:form name="form" method="post"> -<roundcube:object name="loginform" form="form" /> - -<p style="text-align:center;"><input type="submit" class="button mainaction" value="<roundcube:label name='login' />" /></p> - +<roundcube:object name="loginform" form="form" submit=true /> </form> + </div> </div> diff --git a/skins/larry/templates/login.html b/skins/larry/templates/login.html index 8da941189..64ff6be92 100644 --- a/skins/larry/templates/login.html +++ b/skins/larry/templates/login.html @@ -12,11 +12,9 @@ <roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" /> <roundcube:form name="form" method="post"> -<roundcube:object name="loginform" form="form" size="40" /> - -<p class="formbuttons"><input type="submit" class="button mainaction" value="<roundcube:label name='login' />" /></p> - +<roundcube:object name="loginform" form="form" size="40" submit=true /> </form> + </div> <div class="box-bottom"> |