From 86dd03677466ceb37e0a2d3d43e8a76472966745 Mon Sep 17 00:00:00 2001
From: Thomas B. <thomas@roundcube.net>
Date: Tue, 30 Jul 2013 02:25:54 -0400
Subject: [PATCH] Merge pull request #96 from Dennis1993/patch-6
---
skins/larry/templates/mail.html | 2 +-
program/include/rcmail_output_html.php | 4 ++--
program/steps/settings/func.inc | 2 +-
skins/larry/styles.css | 4 ++++
skins/larry/includes/header.html | 2 +-
program/lib/Roundcube/html.php | 2 +-
skins/larry/templates/login.html | 2 +-
7 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php
index 9987795..a2ec29c 100644
--- a/program/include/rcmail_output_html.php
+++ b/program/include/rcmail_output_html.php
@@ -1531,9 +1531,9 @@
$input_action = new html_hiddenfield(array('name' => '_action', 'value' => 'login'));
$input_tzone = new html_hiddenfield(array('name' => '_timezone', 'id' => 'rcmlogintz', 'value' => '_default_'));
$input_url = new html_hiddenfield(array('name' => '_url', 'id' => 'rcmloginurl', 'value' => $url));
- $input_user = new html_inputfield(array('name' => '_user', 'id' => 'rcmloginuser')
+ $input_user = new html_inputfield(array('name' => '_user', 'id' => 'rcmloginuser', 'required' => 'required')
+ $attrib + $user_attrib);
- $input_pass = new html_passwordfield(array('name' => '_pass', 'id' => 'rcmloginpwd')
+ $input_pass = new html_passwordfield(array('name' => '_pass', 'id' => 'rcmloginpwd', 'required' => 'required')
+ $attrib + $pass_attrib);
$input_host = null;
diff --git a/program/lib/Roundcube/html.php b/program/lib/Roundcube/html.php
index 3e6e47a..a367112 100644
--- a/program/lib/Roundcube/html.php
+++ b/program/lib/Roundcube/html.php
@@ -358,7 +358,7 @@
protected $tagname = 'input';
protected $type = 'text';
protected $allowed = array(
- 'type','name','value','size','tabindex','autocapitalize',
+ 'type','name','value','size','tabindex','autocapitalize','required',
'autocomplete','checked','onchange','onclick','disabled','readonly',
'spellcheck','results','maxlength','src','multiple','accept',
'placeholder','autofocus',
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index dbc9b3c..f6ea79e 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -546,7 +546,7 @@
$blocks['main']['options']['default_charset'] = array(
'title' => html::label($field_id, Q(rcube_label('defaultcharset'))),
'content' => $RCMAIL->output->charset_selector(array(
- 'name' => '_default_charset', 'selected' => $config['default_charset']
+ 'id' => $field_id, 'name' => '_default_charset', 'selected' => $config['default_charset']
)));
}
diff --git a/skins/larry/includes/header.html b/skins/larry/includes/header.html
index c8b3b26..5a934d8 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" border="0" alt="Logo" onclick="rcmail.command('switch-task','mail');return false;" />
+ <roundcube:object name="logo" src="/images/roundcube_logo.png" id="toplogo" alt="Logo" onclick="rcmail.command('switch-task','mail');return false;" />
</div>
<roundcube:endif />
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index ec4f304..288b010 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -50,6 +50,8 @@
input[type="text"]:focus,
input[type="password"]:focus,
+input[type="text"]:required,
+input[type="password"]:required,
input.button:focus,
textarea:focus {
border-color: #4787b1;
@@ -611,6 +613,7 @@
#toplogo {
padding-top: 2px;
cursor: pointer;
+ border: none;
}
.topleft {
@@ -1578,6 +1581,7 @@
#login-form #logo {
margin-bottom: 20px;
+ border: none;
}
#login-form #message {
diff --git a/skins/larry/templates/login.html b/skins/larry/templates/login.html
index 6e56ee2..13e919a 100644
--- a/skins/larry/templates/login.html
+++ b/skins/larry/templates/login.html
@@ -9,7 +9,7 @@
<div id="login-form">
<div class="box-inner">
-<roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" border="0" />
+<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" />
diff --git a/skins/larry/templates/mail.html b/skins/larry/templates/mail.html
index 6015054..7ef12bf 100644
--- a/skins/larry/templates/mail.html
+++ b/skins/larry/templates/mail.html
@@ -124,7 +124,7 @@
</div><!-- end mainscreen -->
-<div><!-- end minwidth -->
+</div><!-- end minwidth -->
<div id="searchmenu" class="popupmenu">
<ul class="toolbarmenu">
--
Gitblit v1.9.1