From 0c219c78692561ce53108dc1800061f8b783898a Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 28 Mar 2007 04:23:42 -0400
Subject: [PATCH] Draw box around login form; created common boxtitle CSS class
---
skins/default/common.css | 12 ++++++++++++
skins/default/templates/showcontact.html | 2 +-
program/include/main.inc | 2 +-
skins/default/templates/login.html | 20 ++++++++++++++++++--
skins/default/templates/addcontact.html | 2 +-
skins/default/templates/editcontact.html | 2 +-
skins/default/addresses.css | 16 ----------------
7 files changed, 34 insertions(+), 22 deletions(-)
diff --git a/program/include/main.inc b/program/include/main.inc
index b6d995c..6d77d5a 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -1308,7 +1308,7 @@
// show a label
case 'label':
if ($attrib['name'] || $attrib['command'])
- return Q(rcube_label($attrib));
+ return Q(rcube_label($attrib + array('vars' => array('product' => $CONFIG['product_name']))));
break;
// create a menu item
diff --git a/skins/default/addresses.css b/skins/default/addresses.css
index 5eb5c6b..0ff1b28 100644
--- a/skins/default/addresses.css
+++ b/skins/default/addresses.css
@@ -99,18 +99,6 @@
/* visibility: hidden; */
}
-#contact-title
-{
- height: 12px !important;
-/* height: 20px; */
- padding: 4px 20px 3px 20px;
- border-bottom: 1px solid #999999;
- color: #333333;
- font-size: 11px;
- font-weight: bold;
- background-color: #EBEBEB;
- background-image: url(images/listheader_aqua.gif);
-}
#contact-details
{
@@ -124,9 +112,5 @@
text-align: right;
padding-right: 10px;
}
-
-
-
-
diff --git a/skins/default/common.css b/skins/default/common.css
index afccc8f..b3c234f 100755
--- a/skins/default/common.css
+++ b/skins/default/common.css
@@ -239,6 +239,18 @@
background-position: 1px center;
}
+.boxtitle
+{
+ height: 12px !important;
+ padding: 4px 20px 3px 20px;
+ border-bottom: 1px solid #999;
+ color: #333;
+ font-size: 11px;
+ font-weight: bold;
+ background-color: #EBEBEB;
+ background-image: url(images/listheader_aqua.gif);
+}
+
/***** common table settings ******/
diff --git a/skins/default/templates/addcontact.html b/skins/default/templates/addcontact.html
index a7f4379..d4fc9cc 100644
--- a/skins/default/templates/addcontact.html
+++ b/skins/default/templates/addcontact.html
@@ -7,7 +7,7 @@
</head>
<body class="iframe">
-<div id="contact-title"><roundcube:label name="addcontact" /></div>
+<div id="contact-title" class="boxtitle"><roundcube:label name="addcontact" /></div>
<div id="contact-details">
<roundcube:object name="contacteditform" size="40" />
diff --git a/skins/default/templates/editcontact.html b/skins/default/templates/editcontact.html
index 34f14e1..bff81df 100644
--- a/skins/default/templates/editcontact.html
+++ b/skins/default/templates/editcontact.html
@@ -7,7 +7,7 @@
</head>
<body class="iframe">
-<div id="contact-title"><roundcube:label name="editcontact" /></div>
+<div id="contact-title" class="boxtitle"><roundcube:label name="editcontact" /></div>
<div id="contact-details">
<roundcube:object name="contacteditform" size="40" />
diff --git a/skins/default/templates/login.html b/skins/default/templates/login.html
index 3739171..6f7999d 100644
--- a/skins/default/templates/login.html
+++ b/skins/default/templates/login.html
@@ -9,7 +9,19 @@
margin-left: auto;
margin-right: auto;
margin-top: 50px;
- width: 350px;
+ width: 380px;
+ border: 1px solid #999;
+}
+
+#login-form table td.title
+{
+ color: #666;
+ text-align: right;
+ padding-right: 10px;
+}
+
+.boxcontent {
+ padding: 20px 20px 10px 20px;
}
</style>
@@ -21,13 +33,17 @@
<roundcube:object name="message" id="message" />
<div id="login-form">
+<div class="boxtitle"><roundcube:label name="welcome" /></div>
+<div class="boxcontent">
+
<form name="form" action="./" method="post">
<roundcube:object name="loginform" form="form" />
-<p style="text-align: center;"><input type="submit" class="button" value="<roundcube:label name='login' />" /></p>
+<p style="text-align:center;"><input type="submit" class="button" value="<roundcube:label name='login' />" /></p>
</form>
</div>
+</div>
</body>
</html>
diff --git a/skins/default/templates/showcontact.html b/skins/default/templates/showcontact.html
index 8a84343..53bc08b 100644
--- a/skins/default/templates/showcontact.html
+++ b/skins/default/templates/showcontact.html
@@ -7,7 +7,7 @@
</head>
<body class="iframe">
-<div id="contact-title"><roundcube:object name="contactdetails" part="name" /></div>
+<div id="contact-title" class="boxtitle"><roundcube:object name="contactdetails" part="name" /></div>
<div id="contact-details">
<roundcube:object name="contactdetails" />
--
Gitblit v1.9.1