From: rmccabe@sourceware.org <rmccabe@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga/luci/plone-custom base.css.dtml colophon ...
Date: 19 Sep 2006 14:48:24 -0000 [thread overview]
Message-ID: <20060919144824.32370.qmail@sourceware.org> (raw)
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-09-19 14:48:21
Modified files:
luci/plone-custom: base.css.dtml colophon
failsafe_login_form.cpt footer
global_personalbar global_sections
login_failed login_form.cpt login_success
Added files:
luci/plone-custom: portlet_login
Removed files:
luci/plone-custom: portlet_login.cpt
Log message:
portal_login isn't a controller template, so remove .cpt extension
the rest is just whitespace cleanup
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/portlet_login.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/base.css.dtml.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/colophon.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/failsafe_login_form.cpt.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/footer.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/global_personalbar.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/global_sections.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/login_failed.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/login_form.cpt.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/login_success.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/portlet_login.cpt.diff?cvsroot=cluster&r1=1.1&r2=NONE
--- conga/luci/plone-custom/portlet_login 2006/09/18 21:09:53 1.6
+++ conga/luci/plone-custom/portlet_login 2006/09/19 14:48:21 1.7
@@ -1,125 +1,115 @@
<html xmlns:tal="http://xml.zope.org/namespaces/tal"
- xmlns:metal="http://xml.zope.org/namespaces/metal"
- i18n:domain="plone">
-<body tal:define="Iterator python:modules['Products.CMFPlone'].IndexIterator;
- tabindex python:Iterator(mainSlot=False)">
-<div metal:define-macro="portlet"
- tal:omit-tag=""
- tal:define="pageloc python: request.URL.split('/')[-1];
- okToShowHere python: not pageloc in ('login_form', 'join_form');
- auth nocall:here/acl_users/credentials_cookie_auth|nothing"
- tal:condition="python: isAnon and okToShowHere">
-
-<tal:block tal:condition="python: here.siteIsSetup()">
-<dl class="portlet"
- id="portlet-login"
- tal:define="ac_name auth/name_cookie|string:__ac_name;
- ac_password auth/pw_cookie|string:__ac_password;
- ac_persist auth/persist_cookie|nothing;
- join python:0;
- canRegister python:0;
- canRequestPassword python:0"
- tal:condition="python: auth">
-
- <dt class="portletHeader">
- <span class="portletTopLeft"></span>
- <a href="#"
- class="tile"
- tal:attributes="href string:$portal_url/login_form"
- i18n:translate="box_sign_in">Log in</a>
- <span class="portletTopRight"></span>
- </dt>
-
- <dd class="portletItem odd">
- <form action="login_form"
- name="loginform"
- method="post"
- tal:attributes="action string:${portal_url}/login_form">
-
- <input type="hidden" name="form.submitted" value="1" />
- <input type="hidden" name="came_from" value=""
- tal:attributes="value context/@@plone/getCurrentUrl" />
- <input type="hidden" name="js_enabled" id="js_enabled" value="0" />
- <input type="hidden" name="cookies_enabled" id="cookies_enabled" value="" />
- <input type="hidden" name="login_name" id="login_name" value="" />
- <input type="hidden" name="pwd_empty" id="pwd_empty" value="0" />
-
- <div class="field">
- <label for=""
- tal:attributes="for ac_name"
- i18n:translate="label_login_name">Login Name</label>
- <br />
- <input type="text"
- size="10"
- alt="Login Name"
- onclick="showCookieMessage('cookies_message')"
- tal:attributes="name ac_name; id ac_name;
- value python:request.get(ac_name, '');
- tabindex tabindex/next"
- i18n:attributes="alt label_login_name;"/>
- </div>
-
- <div class="field">
- <label for=""
- tal:attributes="for ac_password"
- i18n:translate="label_password">Password</label>
- <br />
- <input type="password"
- size="10"
- alt="Password"
- onclick="showCookieMessage('cookies_message')"
- tal:attributes="name ac_password; id ac_password;
- tabindex tabindex/next;"
- i18n:attributes="alt label_password;"/>
- </div>
-
- <div id="cookies_message" i18n:translate="enable_cookies_message" class="portalMessage" style="display:none">
- Cookies are not enabled. You must <span i18n:name="enable_cookies">
- <a href="enabling_cookies" i18n:translate="label_enable_cookies">enable cookies</a></span> before you can log in.
- </div>
-
- <div class="formControls">
-
- <input
- type="submit"
- name="submit"
- value="Log in"
- alt="Log in"
- tal:attributes="tabindex tabindex/next;
- onclick string:javascript:return setLoginVars('$ac_name','login_name','$ac_password','pwd_empty','js_enabled','cookies_enabled');"
- i18n:attributes="value label_log_in; alt label_log_in;"/>
- </div>
- </form>
- </dd>
-
- </dl>
+ xmlns:metal="http://xml.zope.org/namespaces/metal"
+ i18n:domain="plone">
+<body
+ tal:define="Iterator python:modules['Products.CMFPlone'].IndexIterator;
+ tabindex python:Iterator(mainSlot=False)">
+<div metal:define-macro="portlet"
+ tal:omit-tag=""
+ tal:define="pageloc python: request.URL.split('/')[-1];
+ okToShowHere python: not pageloc in ('login_form', 'join_form');
+ auth nocall:here/acl_users/credentials_cookie_auth|nothing"
+ tal:condition="python: isAnon and okToShowHere">
+<tal:block tal:condition="python: here.siteIsSetup()">
<dl class="portlet"
- id="portlet-login"
- tal:condition="python: not auth">
+ id="portlet-login"
+ tal:define="ac_name auth/name_cookie|string:__ac_name;
+ ac_password auth/pw_cookie|string:__ac_password;
+ ac_persist auth/persist_cookie|nothing;
+ join python:0;
+ canRegister python:0;
+ canRequestPassword python:0"
+ tal:condition="python: auth">
+
+ <dt class="portletHeader">
+ <span class="portletTopLeft"></span>
+ <a href="#" class="tile"
+ tal:attributes="href string:$portal_url/login_form"
+ i18n:translate="box_sign_in">Log in</a>
+ <span class="portletTopRight"></span>
+ </dt>
+
+ <dd class="portletItem odd">
+ <form action="login_form" name="loginform" method="post"
+ tal:attributes="action string:${portal_url}/login_form">
+
+ <input type="hidden" name="form.submitted" value="1" />
+ <input type="hidden" name="came_from" value=""
+ tal:attributes="value context/@@plone/getCurrentUrl" />
+ <input type="hidden" name="js_enabled" id="js_enabled" value="0" />
+ <input type="hidden" name="cookies_enabled" id="cookies_enabled" value="" />
+ <input type="hidden" name="login_name" id="login_name" value="" />
+ <input type="hidden" name="pwd_empty" id="pwd_empty" value="0" />
+
+ <div class="field">
+ <label for=""
+ tal:attributes="for ac_name"
+ i18n:translate="label_login_name">Login Name</label>
+ <br />
+ <input type="text"
+ size="10"
+ alt="Login Name"
+ onclick="showCookieMessage('cookies_message')"
+ tal:attributes="name ac_name; id ac_name;
+ value python:request.get(ac_name, '');
+ tabindex tabindex/next"
+ i18n:attributes="alt label_login_name;"/>
+ </div>
+
+ <div class="field">
+ <label for=""
+ tal:attributes="for ac_password"
+ i18n:translate="label_password">Password</label>
+ <br />
+ <input type="password" size="10" alt="Password"
+ onclick="showCookieMessage('cookies_message')"
+ tal:attributes="name ac_password; id ac_password;
+ tabindex tabindex/next;"
+ i18n:attributes="alt label_password;"
+ />
+ </div>
+
+ <div id="cookies_message" i18n:translate="enable_cookies_message" class="portalMessage" style="display:none">
+ Cookies are not enabled. You must <span i18n:name="enable_cookies">
+ <a href="enabling_cookies" i18n:translate="label_enable_cookies">enable cookies</a></span> before you can log in.
+ </div>
+
+ <div class="formControls">
+ <input type="submit" name="submit" value="Log in" alt="Log in"
+ tal:attributes="tabindex tabindex/next;
+ onclick string:javascript:return setLoginVars('$ac_name','login_name','$ac_password','pwd_empty','js_enabled','cookies_enabled');"
+ i18n:attributes="value label_log_in; alt label_log_in;"
+ />
+ </div>
+ </form>
+ </dd>
+</dl>
+
+<dl class="portlet" id="portlet-login"
+ tal:condition="python: not auth">
- <dt class="portletHeader">
- <a href="#"
- class="tile"
- i18n:translate="box_sign_in">Log in</a>
- </dt>
-
- <dd class="portletItem"
- tal:condition="python: not auth"
- i18n:translate="login_portlet_disabled">
- Cookie authentication is disabled.
- Login portlet not available.
- </dd>
+ <dt class="portletHeader">
+ <a href="#" class="tile"
+ i18n:translate="box_sign_in">Log in</a>
+ </dt>
+
+ <dd class="portletItem"
+ tal:condition="python: not auth"
+ i18n:translate="login_portlet_disabled">
+ Cookie authentication is disabled.
+ Login portlet not available.
+ </dd>
</dl>
</tal:block>
<div style="margin-top:1em" tal:condition="python: not here.siteIsSetup()">
- The Luci server has not been initialized. To initialize it, log in in to the server as root and run the command<br>
- <code style="margin-left:+1.5em">luci_admin init</code>
+ The Luci server has not been initialized. To initialize it, log in in to the server as root and run the command
+ <br/><code style="margin-left:+1.5em">luci_admin init</code>
</div>
--- conga/luci/plone-custom/base.css.dtml 2006/09/15 21:26:41 1.1
+++ conga/luci/plone-custom/base.css.dtml 2006/09/19 14:48:21 1.2
@@ -18,51 +18,51 @@
body {
- font: &dtml-fontBaseSize; <dtml-var fontFamily>;
- background-color: &dtml-backgroundColor;;
- color: &dtml-fontColor;;
- margin: 0;
- padding: 0;
+ font: &dtml-fontBaseSize; <dtml-var fontFamily>;
+ background-color: &dtml-backgroundColor;;
+ color: &dtml-fontColor;;
+ margin: 0;
+ padding: 0;
}
table {
- font-size: 100%;
+ font-size: 100%;
}
a {
- color: &dtml-linkColor;;
- background-color: transparent;
+ color: &dtml-linkColor;;
+ background-color: transparent;
}
img {
- border: none;
- vertical-align: middle;
+ border: none;
+ vertical-align: middle;
}
p {
- margin: 0 0 0.75em 0;
- line-height: 1.5em;
+ margin: 0 0 0.75em 0;
+ line-height: 1.5em;
}
p img {
- border: none;
- margin: 0;
+ border: none;
+ margin: 0;
}
hr {
- border: 0;
- height: &dtml-borderWidth;;
- color: &dtml-globalBorderColor;;
- background-color: &dtml-globalBorderColor;;
- margin: 0.5em 0 1em 0;
+ border: 0;
+ height: &dtml-borderWidth;;
+ color: &dtml-globalBorderColor;;
+ background-color: &dtml-globalBorderColor;;
+ margin: 0.5em 0 1em 0;
}
h1, h2, h3, h4, h5, h6 {
- color: &dtml-fontColor;;
- background-color: transparent;
- font-family: <dtml-var headingFontFamily>;
- font-weight: normal;
- margin: 0 0 0.25em 0;
- border-bottom: &dtml-borderWidth; &dtml-borderStyle; &dtml-globalBorderColor;;
+ color: &dtml-fontColor;;
+ background-color: transparent;
+ font-family: <dtml-var headingFontFamily>;
+ font-weight: normal;
+ margin: 0 0 0.25em 0;
+ border-bottom: &dtml-borderWidth; &dtml-borderStyle; &dtml-globalBorderColor;;
}
h1 a,
@@ -71,201 +71,201 @@
h4 a,
h5 a,
h6 a {
- color: &dtml-fontColor; ! important;
- text-decoration: none;
+ color: &dtml-fontColor; ! important;
+ text-decoration: none;
}
h1 {
- font-size: 160%;
+ font-size: 160%;
}
h2 {
- font-size: 150%;
+ font-size: 150%;
}
h3 {
- font-size: 125%;
- border-bottom: none;
- font-weight: bold;
+ font-size: 125%;
+ border-bottom: none;
+ font-weight: bold;
}
h4 {
- font-size: 110%;
- border-bottom: none;
- font-weight: bold;
+ font-size: 110%;
+ border-bottom: none;
+ font-weight: bold;
}
h5 {
- font-size: 100%;
- border-bottom: none;
- font-weight: bold;
+ font-size: 100%;
+ border-bottom: none;
+ font-weight: bold;
}
h6 {
- font-size: &dtml-fontSmallSize;;
- border-bottom: none;
- font-weight: bold;
+ font-size: &dtml-fontSmallSize;;
+ border-bottom: none;
+ font-weight: bold;
}
ul {
- line-height: 1.5em;
- margin: 0.5em 0 0 1.5em;
- padding: 0;
- list-style-image: url(&dtml-portal_url;/bullet.gif);
- list-style-type: square;
+ line-height: 1.5em;
+ margin: 0.5em 0 0 1.5em;
+ padding: 0;
+ list-style-image: url(&dtml-portal_url;/bullet.gif);
+ list-style-type: square;
}
ol {
- line-height: 1.5em;
- margin: 0.5em 0 0 2.5em;
- padding: 0;
- list-style-image: none;
+ line-height: 1.5em;
+ margin: 0.5em 0 0 2.5em;
+ padding: 0;
+ list-style-image: none;
}
li {
- margin-bottom: 0.5em;
+ margin-bottom: 0.5em;
}
dt {
- font-weight: bold;
+ font-weight: bold;
}
dd {
- line-height: 1.5em;
- margin-bottom: 1em;
+ line-height: 1.5em;
+ margin-bottom: 1em;
}
fieldset {
- border: &dtml-borderWidth; &dtml-borderStyle; &dtml-globalBorderColor;;
- margin: 1em 0em 1em 0em;
- padding: 0em 1em 1em 1em;
- line-height: 1.5em;
- width: auto;
+ border: &dtml-borderWidth; &dtml-borderStyle; &dtml-globalBorderColor;;
+ margin: 1em 0em 1em 0em;
+ padding: 0em 1em 1em 1em;
+ line-height: 1.5em;
+ width: auto;
}
legend {
- background: &dtml-backgroundColor;;
- padding: 0.5em;
- font-size: 90%;
+ background: &dtml-backgroundColor;;
+ padding: 0.5em;
+ font-size: 90%;
}
form {
- border: none;
- margin: 0;
+ border: none;
+ margin: 0;
}
label {
- font-weight: bold;
+ font-weight: bold;
}
textarea {
- font: 100% Monaco, "Courier New", Courier, monospace;
- border: &dtml-borderWidth; solid &dtml-globalBorderColor;;
- color: &dtml-inputFontColor;;
- background: White url(&dtml-portal_url;/input_background.gif) repeat-x;
- width: 100%;
+ font: 100% Monaco, "Courier New", Courier, monospace;
+ border: &dtml-borderWidth; solid &dtml-globalBorderColor;;
+ color: &dtml-inputFontColor;;
+ background: White url(&dtml-portal_url;/input_background.gif) repeat-x;
+ width: 100%;
}
input {
- font-family: <dtml-var fontFamily>;
- border: &dtml-borderWidth; solid &dtml-globalBorderColor;;
- color: &dtml-inputFontColor;;
- vertical-align: middle;
- background: White url(&dtml-portal_url;/input_background.gif) repeat-x;
+ font-family: <dtml-var fontFamily>;
+ border: &dtml-borderWidth; solid &dtml-globalBorderColor;;
+ color: &dtml-inputFontColor;;
+ vertical-align: middle;
+ background: White url(&dtml-portal_url;/input_background.gif) repeat-x;
}
select {
- border: &dtml-borderWidth; solid &dtml-globalBorderColor;;
- color: &dtml-inputFontColor;;
- background-color: White;
- vertical-align: top;
+ border: &dtml-borderWidth; solid &dtml-globalBorderColor;;
+ color: &dtml-inputFontColor;;
+ background-color: White;
+ vertical-align: top;
}
abbr, acronym, .explain {
- border-bottom: &dtml-borderWidth; dotted &dtml-fontColor;;
- color: &dtml-fontColor;;
- background-color: transparent;
- cursor: help;
+ border-bottom: &dtml-borderWidth; dotted &dtml-fontColor;;
+ color: &dtml-fontColor;;
+ background-color: transparent;
+ cursor: help;
}
q {
- font-family: Baskerville, Georgia, serif;
- font-style: italic;
- font-size: 120%;
+ font-family: Baskerville, Georgia, serif;
+ font-style: italic;
+ font-size: 120%;
}
blockquote {
- padding-left: 0.5em;
- margin-left: 0;
- border-left: 4px solid &dtml-globalBorderColor;;
- color: &dtml-discreetColor;;
+ padding-left: 0.5em;
+ margin-left: 0;
+ border-left: 4px solid &dtml-globalBorderColor;;
+ color: &dtml-discreetColor;;
}
code {
- font-family: Monaco, "Courier New", Courier, monospace;
- font-size: 120%;
- color: &dtml-fontColor;;
- background-color: &dtml-globalBackgroundColor;;
- padding: 0 0.1em;
+ font-family: Monaco, "Courier New", Courier, monospace;
+ font-size: 120%;
+ color: &dtml-fontColor;;
+ background-color: &dtml-globalBackgroundColor;;
+ padding: 0 0.1em;
}
pre {
- font-family: Monaco, "Courier New", Courier, monospace;
- font-size: 100%;
- padding: 1em;
- border: &dtml-borderWidth; &dtml-borderStyle; &dtml-globalBorderColor;;
- color: &dtml-fontColor;;
- background-color: &dtml-globalBackgroundColor;;
- overflow: auto;
+ font-family: Monaco, "Courier New", Courier, monospace;
+ font-size: 100%;
+ padding: 1em;
+ border: &dtml-borderWidth; &dtml-borderStyle; &dtml-globalBorderColor;;
+ color: &dtml-fontColor;;
+ background-color: &dtml-globalBackgroundColor;;
+ overflow: auto;
}
ins {
- color: green;
- text-decoration: none;
+ color: green;
+ text-decoration: none;
}
del {
- color: red;
- text-decoration: line-through;
+ color: red;
+ text-decoration: line-through;
}
/* Helper element to work with CSS floats */
.visualClear {
- display: block;
- clear: both;
+ display: block;
+ clear: both;
}
/* Hiding helper elements for old browsers */
.netscape4 {
- display: none;
+ display: none;
}
/* Accessibility and visual enhancement elements */
.hiddenStructure {
- display: block;
- background: transparent;
- background-image: none; /* safari bug */
- border: none;
- height: 1px;
- overflow: hidden;
- padding: 0;
- margin: -1px 0 0 -1px;
- width: 1px;
+ display: block;
+ background: transparent;
+ background-image: none; /* safari bug */
+ border: none;
+ height: 1px;
+ overflow: hidden;
+ padding: 0;
+ margin: -1px 0 0 -1px;
+ width: 1px;
}
.contentViews .hiddenStructure,
.contentActions .hiddenStructure {
- position: absolute;
- top: -200px;
- left: -200px;
+ position: absolute;
+ top: -200px;
+ left: -200px;
}
.hiddenLabel {
- display: block;
- background: transparent;
- background-image: none; /* safari bug */
- border: none;
- height: 1px;
- overflow: hidden;
- padding: 0;
- margin: -1px 0 0 -1px;
- width: 1px;
+ display: block;
+ background: transparent;
+ background-image: none; /* safari bug */
+ border: none;
+ height: 1px;
+ overflow: hidden;
+ padding: 0;
+ margin: -1px 0 0 -1px;
+ width: 1px;
}
/* </dtml-with> */
--- conga/luci/plone-custom/colophon 2006/07/26 16:55:37 1.1
+++ conga/luci/plone-custom/colophon 2006/09/19 14:48:21 1.2
@@ -1,12 +1,14 @@
<html xmlns="http://www.w3.org/1999/xhtml"
- xml:lang="en" lang="en"
- i18n:domain="plone">
+ xml:lang="en" lang="en"
+ i18n:domain="plone">
- <head><title></title></head>
- <body>
+<head>
+ <title></title>
+</head>
- <div id="portal-colophon" metal:define-macro="colophon" i18n:domain="plone">
- </div>
+<body>
+ <div id="portal-colophon" metal:define-macro="colophon" i18n:domain="plone">
+ </div>
+</body>
- </body>
</html>
--- conga/luci/plone-custom/failsafe_login_form.cpt 2006/09/18 21:09:53 1.1
+++ conga/luci/plone-custom/failsafe_login_form.cpt 2006/09/19 14:48:21 1.2
@@ -1,20 +1,21 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"
- i18n:domain="plone">
+ i18n:domain="plone">
+
<head>
- <title i18n:translate="heading_sign_in">Please log in</title>
+ <title i18n:translate="heading_sign_in">Please log in</title>
</head>
<body>
<div tal:define="checkPermission nocall:here/portal_membership/checkPermission;
- actions python:context.portal_actions.listFilteredActionsFor(context);
- Iterator python:modules['Products.CMFPlone'].IndexIterator;
- tabindex python:Iterator(pos=30000);
- auth nocall:here/acl_users/credentials_cookie_auth|nothing;
- came_from request/came_from|request/HTTP_REFERER|nothing;
- came_from python:test(here.portal_url.isURLInPortal(came_from), came_from, None);
- ztutils modules/ZTUtils;
- errors options/state/getErrors;">
+ actions python:context.portal_actions.listFilteredActionsFor(context);
+ Iterator python:modules['Products.CMFPlone'].IndexIterator;
+ tabindex python:Iterator(pos=30000);
+ auth nocall:here/acl_users/credentials_cookie_auth|nothing;
+ came_from request/came_from|request/HTTP_REFERER|nothing;
+ came_from python:test(here.portal_url.isURLInPortal(came_from), came_from, None);
+ ztutils modules/ZTUtils;
+ errors options/state/getErrors;">
<tal:block tal:condition="python:here.siteIsSetup()">
@@ -25,139 +26,125 @@
</p>
<div id="enable_cookies_message" i18n:translate="enable_cookies_message" class="portalMessage" style="display:none">
- Cookies are not enabled. You must <span i18n:name="enable_cookies">
- <a href="enabling_cookies" i18n:translate="label_enable_cookies">enable cookies</a></span> before you can log in.
+ Cookies are not enabled. You must <span i18n:name="enable_cookies">
+ <a href="enabling_cookies" i18n:translate="label_enable_cookies">enable cookies</a></span> before you can log in.
</div>
<div tal:condition="python: not auth" i18n:translate="login_form_disabled">
- While cookie authentication is disabled, cookie-based login is not available.
+ While cookie authentication is disabled, cookie-based login is not available.
</div>
<div style="margin-top:1em;margin-bottom:1em"
- tal:define="ac_name auth/name_cookie|python:login_name"
- tal:condition="python:ac_name == 'admin'">
- If you have forgotten your password, you can reset the password by logging in to the server as root and running the command<br>
- <code style="margin-left: +1.5em">luci_admin password</code>
+ tal:define="ac_name auth/name_cookie|python:login_name"
+ tal:condition="python:ac_name == 'admin'">
+
+ If you have forgotten your password, you can reset the password by logging in to the server as root and running the command<br>
+ <code style="margin-left: +1.5em">luci_admin password</code>
</div>
<form tal:attributes="action python:context.absolute_url()+'/'+template.id"
- method="post"
- id="login_form"
- tal:condition="python:auth">
-
- <fieldset tal:define="ac_name auth/name_cookie|string:__ac_name;
- ac_password auth/pw_cookie|string:__ac_password;
- ac_persist auth/persist_cookie|nothing">
-
- <legend i18n:translate="legend_account_details">Account details</legend>
-
- <input type="hidden"
- name="came_from"
- value=""
- tal:attributes="value came_from" />
-
- <input type="hidden" name="form.submitted" value="1" />
- <input type="hidden" name="js_enabled" id="js_enabled" value="0" />
- <input type="hidden" name="cookies_enabled" id="cookies_enabled" value="" />
- <input type="hidden" name="login_name" id="login_name" value="" />
- <input type="hidden" name="pwd_empty" id="pwd_empty" value="0" />
-
- <div class="field"
- tal:define="error python:errors.get(ac_name, None);
- value python:request.get('login_name', request.get(ac_name, None));"
- tal:attributes="class python:test(error, 'field error', 'field')">
-
- <label i18n:translate="label_login_name"
- tal:attributes="for ac_name">Login Name</label>
-
- <div i18n:translate="help_login_name_caps"
- class="formHelp">
- Login names are case sensitive, make sure the caps lock key is not enabled.
- </div>
-
- <div tal:content="error">Validation error output</div>
-
- <input type="text"
- size="15"
- tabindex=""
- tal:attributes="name ac_name;
- id ac_name;
- value value;
- tabindex tabindex/next;"
- />
-
- </div>
-
- <div class="field"
- tal:define="error python:errors.get(ac_password, None);"
- tal:attributes="class python:test(error, 'field error', 'field')">
-
- <label i18n:translate="label_password"
- tal:attributes="for ac_password">Password</label>
-
- <div class="formHelp">
- <div i18n:translate="help_capslock_password">
- Case sensitive, make sure caps lock is not enabled.
- </div>
- </div>
-
- <div tal:content="error">Validation error output</div>
-
- <input type="password"
- size="15"
- tabindex=""
- tal:attributes="name ac_password;
- id ac_password;
- tabindex tabindex/next;"
- />
- </div>
-
- <div class="field" tal:condition="ac_persist">
-
- <input type="checkbox"
- class="noborder formRememberName"
- value="1"
- checked="checked"
- id="cb_remember"
- tabindex=""
- tal:attributes="name ac_persist;
- tabindex tabindex/next;
- checked python:request.get(ac_name, '') and 'checked' or None;"
- />
-
- <label for="cb_remember" i18n:translate="label_remember_my_name">Remember my name.</label>
-
- <div i18n:translate="help_remember_my_name"
- class="formHelp">
- Check this to have your user name filled in automatically when you log in later.
- </div>
-
- </div>
-
- <div class="formControls">
-
- <input
- tabindex=""
- type="submit"
- name="submit"
- value="Log in"
- i18n:attributes="value label_log_in;"
- tal:attributes="tabindex tabindex/next;" />
-
- </div>
-
- <p i18n:translate="remember_to_log_out">
- Please log out or exit your browser when you're done.
- </p>
-
- </fieldset>
+ method="post"
+ id="login_form"
+ tal:condition="python:auth">
+
+ <fieldset tal:define="ac_name auth/name_cookie|string:__ac_name;
+ ac_password auth/pw_cookie|string:__ac_password;
+ ac_persist auth/persist_cookie|nothing">
+
+ <legend i18n:translate="legend_account_details">Account details</legend>
+
+ <input type="hidden" name="came_from" value=""
+ tal:attributes="value came_from" />
+
+ <input type="hidden" name="form.submitted" value="1" />
+ <input type="hidden" name="js_enabled" id="js_enabled" value="0" />
+ <input type="hidden" name="cookies_enabled" id="cookies_enabled" value="" />
+ <input type="hidden" name="login_name" id="login_name" value="" />
+ <input type="hidden" name="pwd_empty" id="pwd_empty" value="0" />
+
+ <div class="field"
+ tal:define="error python:errors.get(ac_name, None);
+ value python:request.get('login_name', request.get(ac_name, None));"
+ tal:attributes="class python:test(error, 'field error', 'field')">
+
+ <label i18n:translate="label_login_name"
+ tal:attributes="for ac_name">Login Name</label>
+
+ <div i18n:translate="help_login_name_caps"
+ class="formHelp">
+ Login names are case sensitive, make sure the caps lock key is not enabled.
+ </div>
+
+ <div tal:content="error">Validation error output</div>
+
+ <input type="text" size="15" tabindex=""
+ tal:attributes="name ac_name;
+ id ac_name;
+ value value;
+ tabindex tabindex/next;"
+ />
+ </div>
+
+ <div class="field"
+ tal:define="error python:errors.get(ac_password, None);"
+ tal:attributes="class python:test(error, 'field error', 'field')">
+
+ <label i18n:translate="label_password"
+ tal:attributes="for ac_password">Password</label>
+
+ <div class="formHelp">
+ <div i18n:translate="help_capslock_password">
+ Case sensitive, make sure caps lock is not enabled.
+ </div>
+ </div>
+
+ <div tal:content="error">Validation error output</div>
+
+ <input type="password" size="15" tabindex=""
+ tal:attributes="name ac_password;
+ id ac_password;
+ tabindex tabindex/next;"
+ />
+ </div>
+
+ <div class="field" tal:condition="ac_persist">
+
+ <input type="checkbox"
+ class="noborder formRememberName"
+ value="1" checked="checked" id="cb_remember"
+ tabindex=""
+ tal:attributes="name ac_persist;
+ tabindex tabindex/next;
+ checked python:request.get(ac_name, '') and 'checked' or None;"
+ />
+
+ <label for="cb_remember" i18n:translate="label_remember_my_name">Remember my name.</label>
+
+ <div i18n:translate="help_remember_my_name"
+ class="formHelp">
+ Check this to have your user name filled in automatically when you log in later.
+ </div>
+
+ </div>
+
+ <div class="formControls">
+ <input tabindex="" type="submit" name="submit" value="Log in"
+ i18n:attributes="value label_log_in;"
+ tal:attributes="tabindex tabindex/next;" />
+ </div>
+
+ <p i18n:translate="remember_to_log_out">
+ Please log out or exit your browser when you're done.
+ </p>
+ </fieldset>
</form>
+
</tal:block>
<div style="margin-top:1em" tal:condition="python: not here.siteIsSetup()">
- The Luci server has not been initialized. To initialize it, log in in to the server as root and run the command<br>
- <code style="margin-left:+1.5em">luci_admin init</code>
+ The Luci server has not been initialized. To initialize it, log in in to the server as root and run the command
+ <br><code style="margin-left:+1.5em">luci_admin init</code>
</div>
</div>
--- conga/luci/plone-custom/footer 2006/07/26 16:55:37 1.1
+++ conga/luci/plone-custom/footer 2006/09/19 14:48:21 1.2
@@ -3,29 +3,35 @@
<div id="portal-footer" metal:define-macro="portal_footer">
<p>
- <span i18n:translate="description_copyright" tal:omit-tag="">
- The
- <span>
- <a href="http://redhat.com">Conga Cluster and Storage Management System</a>
- </span>
- is Copyright
- <acronym title="Copyright" i18n:name="copyright" i18n:attributes="title title_copyright;">©</acronym>
- 2000-<span i18n:name="current_year"
- tal:define="now modules/DateTime/DateTime"
- tal:content="now/year" />
- by <a href="http://redhat.com/Conga">Red Hat, Inc</a>
- </span>
+ <span i18n:translate="description_copyright" tal:omit-tag="">
+ The
+ <span>
+ <a href="http://redhat.com">
+ Conga Cluster and Storage Management System
+ </a>
+ </span>
+ is Copyright
+ <acronym title="Copyright" i18n:name="copyright" i18n:attributes="title title_copyright;">
+ ©
+ </acronym>
+ 2000-
+ <span
+ i18n:name="current_year"
+ tal:define="now modules/DateTime/DateTime"
+ tal:content="now/year" />
+ by <a href="http://redhat.com/Conga">Red Hat, Inc</a>
+ </span>
</p>
<p>
- <span i18n:translate="description_license">
- Distributed under the
- <span i18n:name="license">
- <a href="http://creativecommons.org/licenses/GPL/2.0/" i18n:translate="label_gnu_gpl_licence">GNU GPL license</a>
- </span>.
- </span>
+ <span i18n:translate="description_license">
+ Distributed under the
+ <span i18n:name="license">
+ <a href="http://creativecommons.org/licenses/GPL/2.0/" i18n:translate="label_gnu_gpl_licence">GNU GPL license</a>
+ </span>.
+ </span>
</p>
</div>
</body>
-</html>
\ No newline at end of file
+</html>
--- conga/luci/plone-custom/global_personalbar 2006/08/02 18:12:49 1.1
+++ conga/luci/plone-custom/global_personalbar 2006/09/19 14:48:21 1.2
@@ -1,45 +1,44 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"
- i18n:domain="plone">
+ i18n:domain="plone">
<body>
-<!-- THE PERSONAL BAR DEFINITION -->
-
<div metal:define-macro="personal_bar"
- id="portal-personaltools-wrapper"
- tal:define="display_actions python:user_actions[:-1]+global_actions+user_actions[-1:];
- getIconFor nocall:putils/getIconFor;">
+ id="portal-personaltools-wrapper"
+ tal:define="display_actions python:user_actions[:-1]+global_actions+user_actions[-1:];
+ getIconFor nocall:putils/getIconFor;">
<h5 class="hiddenStructure" i18n:translate="heading_personal_tools">Personal tools</h5>
<ul id="portal-personaltools">
+
<tal:comment tal:replace="nothing">
- <tal:block condition="not: isAnon">
- <li class="portalUser"
- tal:define="author python:mtool.getMemberInfo(user.getId())"><a
- id="user-name"
- tal:attributes="href string:${portal_url}/author/${user/getId}">
- <span class="visualCaseSensitive"
- tal:content="python:author and author['fullname'] or user.getId()">
- John
- </span>
- </a></li>
- </tal:block>
+ <tal:block condition="not: isAnon">
+ <li class="portalUser"
+ tal:define="author python:mtool.getMemberInfo(user.getId())">
+ <a id="user-name"
+ tal:attributes="href string:${portal_url}/author/${user/getId}">
+ <span class="visualCaseSensitive"
+ tal:content="python:author and author['fullname'] or user.getId()" />
+ </a>
+ </li>
+ </tal:block>
</tal:comment>
- <tal:actions tal:repeat="action python:here.getOrderedUserActions(keyed_actions=keyed_actions)">
- <li tal:define="icon python:getIconFor(action['category'], action['id'], None);
- class_name string:actionicon-${action/category}-${action/id};
- class_name python:test(icon, class_name, nothing);"
- tal:attributes="class class_name">
- <a href=""
- tal:attributes="href action/url;
- class python:test(icon, 'visualIconPadding', nothing);">
- <tal:actionname i18n:translate="" tal:content="action/title">dummy</tal:actionname>
- </a>
- </li>
- </tal:actions>
+ <tal:actions
+ tal:repeat="action python:here.getOrderedUserActions(keyed_actions=keyed_actions)">
+ <li tal:define="icon python:getIconFor(action['category'], action['id'], None);
+ class_name string:actionicon-${action/category}-${action/id};
+ class_name python:test(icon, class_name, nothing);"
+ tal:attributes="class class_name">
+ <a href=""
+ tal:attributes="href action/url;
+ class python:test(icon, 'visualIconPadding', nothing);">
+ <tal:actionname i18n:translate="" tal:content="action/title">dummy</tal:actionname>
+ </a>
+ </li>
+ </tal:actions>
</ul>
</div>
--- conga/luci/plone-custom/global_sections 2006/08/02 18:12:49 1.1
+++ conga/luci/plone-custom/global_sections 2006/09/19 14:48:21 1.2
@@ -1,30 +1,28 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"
- i18n:domain="plone">
+ i18n:domain="plone">
<head/>
<body>
-<!-- THE SECTION TABS DEFINITION -->
<div metal:define-macro="portal_tabs"
- tal:omit-tag=""
- tal:define="tabs python:here.getTabs(request)">
+ tal:omit-tag=""
+ tal:define="tabs python:here.getTabs(request)">
- <h5 class="hiddenStructure" i18n:translate="heading_sections">Sections</h5>
+ <h5 class="hiddenStructure" i18n:translate="heading_sections">Sections</h5>
- <ul id="portal-globalnav">
- <tal:tabs tal:repeat="tab tabs">
- <li tal:attributes="id string:portaltab-${tab/Title};
- class python:test(tab['isSelected'], 'selected', 'plain');">
- <a href=""
- tal:content="tab/Title"
- tal:attributes="href tab/Taburl;
- title tab/Description|nothing">
- Tab Name</a>
- </li>
- </tal:tabs>
- </ul>
+ <ul id="portal-globalnav">
+ <tal:tabs tal:repeat="tab tabs">
+ <li tal:attributes="id string:portaltab-${tab/Title};
+ class python:test(tab['isSelected'], 'selected', 'plain');">
+ <a href=""
+ tal:content="tab/Title"
+ tal:attributes="href tab/Taburl;
+ title tab/Description|nothing" />
+ </li>
+ </tal:tabs>
+ </ul>
</div>
</body>
-</html>
\ No newline at end of file
+</html>
--- conga/luci/plone-custom/login_failed 2006/09/18 19:56:35 1.3
+++ conga/luci/plone-custom/login_failed 2006/09/19 14:48:21 1.4
@@ -1,58 +1,63 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
- lang="en"
- metal:use-macro="here/main_template/macros/master"
- i18n:domain="plone">
+ lang="en"
+ metal:use-macro="here/main_template/macros/master"
+ i18n:domain="plone">
<body>
<div metal:fill-slot="main">
- <div metal:define-macro="login_failed"
- tal:define="login_name python:request.get('login_name', '');">
- <h1 i18n:translate="heading_sign_in_failure_auth">Sign-in failure</h1>
+<div metal:define-macro="login_failed"
+ tal:define="login_name python:request.get('login_name', '');">
- <p i18n:translate="description_not_logged_in_username_incorrect">
- You are not currently logged in. Your user name and/or password
- may be incorrect.
- </p>
-
- <div style="margin-top:1em;margin-bottom:1em"
- tal:define="ac_name auth/name_cookie|python:login_name"
- tal:condition="python:ac_name == 'admin'">
- If you have forgotten your password, you can reset the password by logging in to the server as root and running the command<br>
- <code style="margin-left: +1.5em">luci_admin password</code>
- </div>
-
- <p i18n:translate="description_enable_cookies">
- If your user name and password are correct, the problem may be that
- your browser is not configured to <span i18n:name="link">
- <a href="enabling_cookies"
- i18n:translate="description_login_fail_enable_cookies">
- accept cookies
- </a></span>.
- </p>
-
- <p i18n:translate="description_still_failure">
- If you are still reaching this page after correctly configuring
- your browser, here are some possible reasons:
- </p>
-
- <ul>
- <li i18n:translate="description_still_failure_reason1">
- You may be running web filtering software that
- disables cookies. If so, you will need to configure the
- software so that it enables you to accept cookies from
- <span tal:content="utool" tal:omit-tag="" i18n:name="url">url</span>
- </li>
- <li i18n:translate="description_still_failure_reason2">
- Your computer may be behind a firewall or proxy server
- that prevents cookies from being sent to or from your browser.
- If so, you will need to ask your systems administrator if the
- problem can be fixed.
- </li>
- </ul>
- </div>
+ <h1 i18n:translate="heading_sign_in_failure_auth">Sign-in failure</h1>
+
+ <p i18n:translate="description_not_logged_in_username_incorrect">
+ You are not currently logged in. Your user name and/or password
+ may be incorrect.
+ </p>
+
+ <div style="margin-top:1em;margin-bottom:1em"
+ tal:define="ac_name auth/name_cookie|python:login_name"
+ tal:condition="python:ac_name == 'admin'">
+ If you have forgotten your password, you can reset the password by
+ logging in to the server as root and running the command
+ <br/><code style="margin-left: +1.5em">luci_admin password</code>
+ </div>
+
+ <p i18n:translate="description_enable_cookies">
+ If your user name and password are correct, the problem may be that
+ your browser is not configured to
+ <span i18n:name="link">
+ <a href="enabling_cookies"
+ i18n:translate="description_login_fail_enable_cookies">
+ accept cookies
+ </a>
+ </span>.
+ </p>
+
+ <p i18n:translate="description_still_failure">
+ If you are still reaching this page after correctly configuring
+ your browser, here are some possible reasons:
+ </p>
+
+ <ul>
+ <li i18n:translate="description_still_failure_reason1">
+ You may be running web filtering software that
+ disables cookies.If so, you will need to configure the
+ software so that it enables you to accept cookies from
+ <span tal:content="utool" tal:omit-tag="" i18n:name="url">url</span>
+ </li>
+
+ <li i18n:translate="description_still_failure_reason2">
+ Your computer may be behind a firewall or proxy server
+ that prevents cookies from being sent to or from your browser.
+ If so, you will need to ask your systems administrator if the
+ problem can be fixed.
+ </li>
+ </ul>
+</div>
</div>
</body>
-</html>
\ No newline at end of file
+</html>
--- conga/luci/plone-custom/login_form.cpt 2006/09/18 21:09:53 1.1
+++ conga/luci/plone-custom/login_form.cpt 2006/09/19 14:48:21 1.2
@@ -1,25 +1,26 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"
- metal:use-macro="here/main_template/macros/master"
- i18n:domain="plone">
+ metal:use-macro="here/main_template/macros/master"
+ i18n:domain="plone">
<head>
- <script type="text/javascript" metal:fill-slot="javascript_head_slot">
- </script>
- <metal:block fill-slot="top_slot"
- tal:define="dummy python:request.set('disable_border',1)" />
+ <script type="text/javascript" metal:fill-slot="javascript_head_slot">
+ </script>
+
+ <metal:block fill-slot="top_slot"
+ tal:define="dummy python:request.set('disable_border',1)" />
</head>
<body>
<div metal:fill-slot="main"
- tal:define="auth nocall:here/acl_users/credentials_cookie_auth|nothing;
- came_from request/came_from|request/HTTP_REFERER|nothing;
- came_from python:test(utool.isURLInPortal(came_from), came_from, None);
- errors options/state/getErrors;
- ac_name auth/name_cookie|string:__ac_name;
- ac_password auth/pw_cookie|string:__ac_password;
- ac_persist auth/persist_cookie|nothing;
- login_name python:request.get('login_name', request.get(ac_name, ''));">
+ tal:define="auth nocall:here/acl_users/credentials_cookie_auth|nothing;
+ came_from request/came_from|request/HTTP_REFERER|nothing;
+ came_from python:test(utool.isURLInPortal(came_from), came_from, None);
+ errors options/state/getErrors;
+ ac_name auth/name_cookie|string:__ac_name;
+ ac_password auth/pw_cookie|string:__ac_password;
+ ac_persist auth/persist_cookie|nothing;
+ login_name python:request.get('login_name', request.get(ac_name, ''));">
<tal:block tal:condition="python: here.siteIsSetup()">
@@ -29,141 +30,116 @@
To access this part of the site, you need to log in with your user name and password.
</p>
- <div style="margin-top:1em;margin-bottom:1em"
- tal:define="ac_name auth/name_cookie|python:login_name"
- tal:condition="python:ac_name == 'admin'">
- If you have forgotten your password, you can reset the password by logging in to the server as root and running the command<br>
- <code style="margin-left: +1.5em">luci_admin password</code>
- </div>
+<div style="margin-top:1em;margin-bottom:1em"
+ tal:define="ac_name auth/name_cookie|python:login_name"
+ tal:condition="python:ac_name == 'admin'">
+ If you have forgotten your password, you can reset the password by logging in to the server as root and running the command
+ <br><code style="margin-left: +1.5em">luci_admin password</code>
+</div>
<div id="enable_cookies_message" i18n:translate="enable_cookies_message" class="portalMessage" style="display:none">
- Cookies are not enabled. You must <span i18n:name="enable_cookies">
- <a href="enabling_cookies" i18n:translate="label_enable_cookies">enable cookies</a></span> before you can log in.
+ Cookies are not enabled. You must <span i18n:name="enable_cookies">
+ <a href="enabling_cookies" i18n:translate="label_enable_cookies">enable cookies</a></span> before you can log in.
</div>
<div tal:condition="python: not auth" i18n:translate="login_form_disabled">
- While cookie authentication is disabled, cookie-based login is not available.
+ While cookie authentication is disabled, cookie-based login is not available.
</div>
<form tal:attributes="action python:context.absolute_url()+'/'+template.id"
- method="post"
- id="login_form"
- tal:condition="python:auth">
-
- <fieldset>
-
- <legend i18n:translate="legend_account_details">Account details</legend>
-
- <input type="hidden"
- name="came_from"
- value=""
- tal:attributes="value came_from" />
-
- <input type="hidden" name="form.submitted" value="1" />
- <input type="hidden" name="js_enabled" id="js_enabled" value="0" />
- <input type="hidden" name="cookies_enabled" id="cookies_enabled" value="" />
- <input type="hidden" name="login_name" id="login_name" value="" />
- <input type="hidden" name="pwd_empty" id="pwd_empty" value="0" />
-
- <div class="field"
- tal:define="error python:errors.get(ac_name, None);"
- tal:attributes="class python:test(error, 'field error', 'field')">
-
- <label i18n:translate="label_login_name"
- tal:attributes="for ac_name">Login Name</label>
-
- <div i18n:translate="help_login_name_caps"
- class="formHelp">
- Login names are case sensitive, make sure the caps lock key is not enabled.
- </div>
-
- <div tal:content="error">Validation error output</div>
-
- <input type="text"
- size="15"
- tabindex=""
- tal:attributes="name ac_name;
- id ac_name;
- value login_name;
- tabindex tabindex/next;"
- />
-
- </div>
-
- <div class="field"
- tal:define="error python:errors.get(ac_password, None);"
- tal:attributes="class python:test(error, 'field error', 'field')">
-
- <label i18n:translate="label_password"
- tal:attributes="for ac_password">Password</label>
-
- <div class="formHelp">
- <div i18n:translate="help_capslock_password">
- Case sensitive, make sure caps lock is not enabled.
- </div>
- </div>
-
- <div tal:content="error">Validation error output</div>
-
- <input type="password"
- size="15"
- tabindex=""
- tal:attributes="name ac_password;
- id ac_password;
- tabindex tabindex/next;"
- />
- </div>
-
- <div class="field" tal:condition="ac_persist">
-
- <input type="checkbox"
- class="noborder formRememberName"
- value="1"
- checked="checked"
- id="cb_remember"
- tabindex=""
- tal:attributes="name ac_persist;
- tabindex tabindex/next;
- checked python:request.get(ac_name, '') and 'checked' or None;"
- />
-
- <label for="cb_remember" i18n:translate="label_remember_my_name">Remember my name.</label>
-
- <div i18n:translate="help_remember_my_name"
- class="formHelp">
- Check this to have your user name filled in automatically when you log in later.
- </div>
-
- </div>
-
- <div class="formControls">
-
- <input
- tabindex=""
- type="submit"
- name="submit"
- value="Log in"
- i18n:attributes="value label_log_in;"
- tal:attributes="tabindex tabindex/next;
- onclick string:javascript:return setLoginVars('$ac_name','login_name','$ac_password','pwd_empty','js_enabled','cookies_enabled');"
- />
-
- </div>
-
- <p i18n:translate="remember_to_log_out">
- Please log out or exit your browser when you're done.
- </p>
+ method="post" id="login_form"
+ tal:condition="python:auth">
+
+ <fieldset>
+ <legend i18n:translate="legend_account_details">Account details</legend>
- </fieldset>
+ <input type="hidden" name="came_from" value=""
+ tal:attributes="value came_from" />
+
+ <input type="hidden" name="form.submitted" value="1" />
+ <input type="hidden" name="js_enabled" id="js_enabled" value="0" />
+ <input type="hidden" name="cookies_enabled" id="cookies_enabled" value="" />
+ <input type="hidden" name="login_name" id="login_name" value="" />
+ <input type="hidden" name="pwd_empty" id="pwd_empty" value="0" />
+
+ <div class="field"
+ tal:define="error python:errors.get(ac_name, None);"
+ tal:attributes="class python:test(error, 'field error', 'field')">
+
+ <label i18n:translate="label_login_name"
+ tal:attributes="for ac_name">Login Name</label>
+
+ <div i18n:translate="help_login_name_caps" class="formHelp">
+ Login names are case sensitive, make sure the caps lock key is not enabled.
+ </div>
+
+ <div tal:content="error">Validation error output</div>
+ <input type="text" size="15" tabindex=""
+ tal:attributes="name ac_name;
+ id ac_name;
+ value login_name;
+ tabindex tabindex/next;"
+ />
+ </div>
+
+ <div class="field"
+ tal:define="error python:errors.get(ac_password, None);"
+ tal:attributes="class python:test(error, 'field error', 'field')">
+
+ <label i18n:translate="label_password"
+ tal:attributes="for ac_password">Password</label>
+
+ <div class="formHelp">
+ <div i18n:translate="help_capslock_password">
+ Case sensitive, make sure caps lock is not enabled.
+ </div>
+ </div>
+
+ <div tal:content="error">Validation error output</div>
+
+ <input type="password" size="15" tabindex=""
+ tal:attributes="name ac_password;
+ id ac_password;
+ tabindex tabindex/next;"
+ />
+ </div>
+
+ <div class="field" tal:condition="ac_persist">
+ <input type="checkbox" class="noborder formRememberName" value="1"
+ checked="checked" id="cb_remember" tabindex=""
+ tal:attributes="name ac_persist;
+ tabindex tabindex/next;
+ checked python:request.get(ac_name, '') and 'checked' or None;"
+ />
+
+ <label for="cb_remember" i18n:translate="label_remember_my_name">Remember my name.</label>
+
+ <div i18n:translate="help_remember_my_name" class="formHelp">
+ Check this to have your user name filled in automatically when you log in later.
+ </div>
+ </div>
+
+ <div class="formControls">
+ <input tabindex="" type="submit" name="submit" value="Log in"
+ i18n:attributes="value label_log_in;"
+ tal:attributes="tabindex tabindex/next;
+ onclick string:javascript:return setLoginVars('$ac_name','login_name','$ac_password','pwd_empty','js_enabled','cookies_enabled');"
+ />
+ </div>
+
+ <p i18n:translate="remember_to_log_out">
+ Please log out or exit your browser when you're done.
+ </p>
+ </fieldset>
</form>
</tal:block>
<div style="margin-top:1em" tal:condition="python: not here.siteIsSetup()">
- The Luci server has not been initialized. To initialize it, log in in to the server as root and run the command<br>
- <code style="margin-left:+1.5em">luci_admin init</code>
-</div>
+ The Luci server has not been initialized. To initialize it, log in in to the server as root and run the command
+ <br><code style="margin-left:+1.5em">luci_admin init</code>
</div>
+</div>
</body>
</html>
--- conga/luci/plone-custom/login_success 2006/09/18 19:56:35 1.4
+++ conga/luci/plone-custom/login_success 2006/09/19 14:48:21 1.5
@@ -1,59 +1,56 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
- lang="en"
- metal:use-macro="here/main_template/macros/master"
- i18n:domain="plone">
+ lang="en"
+ metal:use-macro="here/main_template/macros/master"
+ i18n:domain="plone">
<head>
- <metal:block fill-slot="top_slot"
- tal:define="dummy python:request.set('disable_border',1)" />
+ <metal:block fill-slot="top_slot"
+ tal:define="dummy python:request.set('disable_border',1)" />
</head>
<body>
<div metal:fill-slot="main">
- <div tal:condition="not:isAnon">
- <div tal:define="came_from request/came_from|string:/luci/homebase/;
- initial_login request/initial_login|nothing;
- js_enabled python:request.get('js_enabled','1')!='0';">
-
- <h1 i18n:translate="heading_you_are_now_logged_in">You are now logged in</h1>
-
- <p tal:condition="python:not came_from">
- <a href=""
- tal:attributes="href portal_url"
- i18n:translate="label_login_continue_to_home_page">
- Continue to the
- <span tal:content="portal/title" i18n:name="portal_title">
- portal title
- </span>
- home page
- </a>
- </p>
-
- <div tal:condition="not:js_enabled">
- <p i18n:translate="description_javascript_advantage">
- You can take fuller advantage of the features of this site
- if you enable javascript in your browser.
- </p>
-
- <p i18n:translate="description_enable_cookies_for_login">
- Note: If you do not remain logged in after leaving this
- page, it is because you need to
- <span i18n:name="enable_cookies">
- <a href="enabling_cookies"
- i18n:translate="label_enable_cookies">
- enable cookies
- </a>
- </span>
- in your browser.
- </p>
- </div>
-
- </div>
- </div>
- <div tal:condition="isAnon">
- <div metal:use-macro="here/login_failed/macros/login_failed" />
- </div>
+ <div tal:condition="not:isAnon">
+ <div tal:define="came_from request/came_from|string:/luci/homebase/;
+ initial_login request/initial_login|nothing;
+ js_enabled python:request.get('js_enabled','1')!='0';">
+
+ <h1 i18n:translate="heading_you_are_now_logged_in">You are now logged in</h1>
+
+ <p tal:condition="python:not came_from">
+ <a href=""
+ tal:attributes="href portal_url"
+ i18n:translate="label_login_continue_to_home_page">
+ Continue to the
+ <span tal:content="portal/title" i18n:name="portal_title">
+ portal title
+ </span>
+ home page</a>
+ </p>
+
+ <div tal:condition="not:js_enabled">
+ <p i18n:translate="description_javascript_advantage">
+ You can take fuller advantage of the features of this site
+ if you enable javascript in your browser.
+ </p>
+
+ <p i18n:translate="description_enable_cookies_for_login">
+ Note: If you do not remain logged in after leaving this
+ page, it is because you need to
+ <span i18n:name="enable_cookies">
+ <a href="enabling_cookies"
+ i18n:translate="label_enable_cookies">enable cookies</a>
+ </span>
+ in your browser.
+ </p>
+ </div>
+ </div>
+ </div>
+
+ <div tal:condition="isAnon">
+ <div metal:use-macro="here/login_failed/macros/login_failed" />
+ </div>
</div>
</body>
reply other threads:[~2006-09-19 14:48 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060919144824.32370.qmail@sourceware.org \
--to=rmccabe@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.