From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 19 Sep 2006 14:48:24 -0000 Subject: [Cluster-devel] conga/luci/plone-custom base.css.dtml colophon ... Message-ID: <20060919144824.32370.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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 @@ - -
- - -
- -
- - Log in - -
- -
-
- - - - - - - - -
- -
- -
- -
- -
- -
- - - -
- - -
-
-
- -
+ xmlns:metal="http://xml.zope.org/namespaces/metal" + i18n:domain="plone"> + +
+
+ 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"> + +
+ + Log in + +
+ +
+
+ + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ + + +
+ +
+
+
+
+ +
-
- Log in -
- -
- Cookie authentication is disabled. - Login portlet not available. -
+
+ Log in +
+ +
+ Cookie authentication is disabled. + Login portlet not available. +
- The Luci server has not been initialized. To initialize it, log in in to the server as root and run the command
- luci_admin init + The Luci server has not been initialized. To initialize it, log in in to the server as root and run the command +
luci_admin init
--- 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; ; - background-color: &dtml-backgroundColor;; - color: &dtml-fontColor;; - margin: 0; - padding: 0; + font: &dtml-fontBaseSize; ; + 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: ; - 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: ; + 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: ; - 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: ; + 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; } /* */ --- 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 @@ + xml:lang="en" lang="en" + i18n:domain="plone"> - - + + + -
-
+ +
+
+ - --- 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 @@ + i18n:domain="plone"> + - Please log in + Please log in
+ 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;"> @@ -25,139 +26,125 @@

- While cookie authentication is disabled, cookie-based login is not available. + While cookie authentication is disabled, cookie-based login is not available.
- If you have forgotten your password, you can reset the password by logging in to the server as root and running the command
- luci_admin password + 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
+ luci_admin password
- -
- - Account details - - - - - - - - - -
- - - -
- Login names are case sensitive, make sure the caps lock key is not enabled. -
- -
Validation error output
- - - -
- -
- - - -
-
- Case sensitive, make sure caps lock is not enabled. -
-
- -
Validation error output
- - -
- -
- - - - - -
- Check this to have your user name filled in automatically when you log in later. -
- -
- -
- - - -
- -

- Please log out or exit your browser when you're done. -

- -
+ method="post" + id="login_form" + tal:condition="python:auth"> + +
+ + Account details + + + + + + + + + +
+ + + +
+ Login names are case sensitive, make sure the caps lock key is not enabled. +
+ +
Validation error output
+ + +
+ +
+ + + +
+
+ Case sensitive, make sure caps lock is not enabled. +
+
+ +
Validation error output
+ + +
+ +
+ + + + + +
+ Check this to have your user name filled in automatically when you log in later. +
+ +
+ +
+ +
+ +

+ Please log out or exit your browser when you're done. +

+
+
- The Luci server has not been initialized. To initialize it, log in in to the server as root and run the command
- luci_admin init + The Luci server has not been initialized. To initialize it, log in in to the server as root and run the command +
luci_admin init
--- 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 @@ - \ No newline at end of file + --- 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 @@ + i18n:domain="plone"> - -
+ id="portal-personaltools-wrapper" + tal:define="display_actions python:user_actions[:-1]+global_actions+user_actions[-1:]; + getIconFor nocall:putils/getIconFor;">
Personal tools
--- 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 @@ + i18n:domain="plone"> -
+ tal:omit-tag="" + tal:define="tabs python:here.getTabs(request)"> -
Sections
+
Sections
- +
- \ No newline at end of file + --- 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 @@ + lang="en" + metal:use-macro="here/main_template/macros/master" + i18n:domain="plone">
-
-

Sign-in failure

+
-

- You are not currently logged in. Your user name and/or password - may be incorrect. -

- -
- If you have forgotten your password, you can reset the password by logging in to the server as root and running the command
- luci_admin password -
- -

- If your user name and password are correct, the problem may be that - your browser is not configured to - - accept cookies - . -

- -

- If you are still reaching this page after correctly configuring - your browser, here are some possible reasons: -

- -
    -
  • - 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 - url -
    • -
  • - 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. -
    • -
-
+

Sign-in failure

+ +

+ You are not currently logged in. Your user name and/or password + may be incorrect. +

+ +
+ If you have forgotten your password, you can reset the password by + logging in to the server as root and running the command +
luci_admin password +
+ +

+ If your user name and password are correct, the problem may be that + your browser is not configured to + + + accept cookies + + . +

+ +

+ If you are still reaching this page after correctly configuring + your browser, here are some possible reasons: +

+ +
    +
  • + 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 + url +
    • + +
  • + 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. +
    • +
+
- \ No newline at end of file + --- 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 @@ + metal:use-macro="here/main_template/macros/master" + i18n:domain="plone"> - - + + +
+ 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, ''));"> @@ -29,141 +30,116 @@ To access this part of the site, you need to log in with your user name and password.

-
- If you have forgotten your password, you can reset the password by logging in to the server as root and running the command
- luci_admin password -
+
+ If you have forgotten your password, you can reset the password by logging in to the server as root and running the command +
luci_admin password +
- While cookie authentication is disabled, cookie-based login is not available. + While cookie authentication is disabled, cookie-based login is not available.
- -
- - Account details - - - - - - - - - -
- - - -
- Login names are case sensitive, make sure the caps lock key is not enabled. -
- -
Validation error output
- - - -
- -
- - - -
-
- Case sensitive, make sure caps lock is not enabled. -
-
- -
Validation error output
- - -
- -
- - - - - -
- Check this to have your user name filled in automatically when you log in later. -
- -
- -
- - - -
- -

- Please log out or exit your browser when you're done. -

+ method="post" id="login_form" + tal:condition="python:auth"> + +
+ Account details -
+ + + + + + + + +
+ + + +
+ Login names are case sensitive, make sure the caps lock key is not enabled. +
+ +
Validation error output
+ +
+ +
+ + + +
+
+ Case sensitive, make sure caps lock is not enabled. +
+
+ +
Validation error output
+ + +
+ +
+ + + + +
+ Check this to have your user name filled in automatically when you log in later. +
+
+ +
+ +
+ +

+ Please log out or exit your browser when you're done. +

+
- The Luci server has not been initialized. To initialize it, log in in to the server as root and run the command
- luci_admin init -
+ The Luci server has not been initialized. To initialize it, log in in to the server as root and run the command +
luci_admin init
+
--- 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 @@ + lang="en" + metal:use-macro="here/main_template/macros/master" + i18n:domain="plone"> - +
-
-
- -

You are now logged in

- -

- - Continue to the - - portal title - - home page - -

- -
-

- You can take fuller advantage of the features of this site - if you enable javascript in your browser. -

- -

- Note: If you do not remain logged in after leaving this - page, it is because you need to - - - enable cookies - - - in your browser. -

-
- -
-
-
-
-
+
+
+ +

You are now logged in

+ +

+ + Continue to the + + portal title + + home page +

+ +
+

+ You can take fuller advantage of the features of this site + if you enable javascript in your browser. +

+ +

+ Note: If you do not remain logged in after leaving this + page, it is because you need to + + enable cookies + + in your browser. +

+
+
+
+ +
+
+