summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-03-11 09:31:45 +0100
committerAleksander Machniak <alec@alec.pl>2014-03-11 09:35:35 +0100
commitb23f2007a3c869f8794adc8e9c0ddd879e7bbed1 (patch)
treec21ef6834a7bd05141610500c388ef5525a752f1
parent1394025bdf0e85dc0c14bf55b0285023653fc3f6 (diff)
Add id for login submit button (#1489676) - make it skin independent
-rw-r--r--program/include/rcmail_output_html.php10
-rw-r--r--skins/classic/common.css4
-rw-r--r--skins/classic/templates/login.html6
-rw-r--r--skins/larry/templates/login.html6
4 files changed, 16 insertions, 10 deletions
diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php
index 0af7fab3b..d4f918506 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">