You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2009/01/29 17:50:06 UTC
svn commit: r738925 - in /lenya/trunk/src/modules-core:
administration/usecases/ gui/resources/css/ usecase/templates/
Author: andreas
Date: Thu Jan 29 16:50:05 2009
New Revision: 738925
URL: http://svn.apache.org/viewvc?rev=738925&view=rev
Log:
Updated layout of error and info messages.
Modified:
lenya/trunk/src/modules-core/administration/usecases/groups.jx
lenya/trunk/src/modules-core/administration/usecases/ipRanges.jx
lenya/trunk/src/modules-core/administration/usecases/reports.jx
lenya/trunk/src/modules-core/administration/usecases/users.jx
lenya/trunk/src/modules-core/gui/resources/css/default.css
lenya/trunk/src/modules-core/gui/resources/css/lenya.css
lenya/trunk/src/modules-core/usecase/templates/messages.jx
Modified: lenya/trunk/src/modules-core/administration/usecases/groups.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/groups.jx?rev=738925&r1=738924&r2=738925&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/groups.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/groups.jx Thu Jan 29 16:50:05 2009
@@ -24,10 +24,6 @@
xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
>
- <page:head>
- <link rel="stylesheet" type="text/css" href="/modules/gui/css/lenya.css"/>
- </page:head>
-
<page:body>
<jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
<div id="contentblock1" class="lenya-tab">
Modified: lenya/trunk/src/modules-core/administration/usecases/ipRanges.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/ipRanges.jx?rev=738925&r1=738924&r2=738925&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/ipRanges.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/ipRanges.jx Thu Jan 29 16:50:05 2009
@@ -24,10 +24,6 @@
xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
>
- <page:head>
- <link rel="stylesheet" type="text/css" href="/modules/gui/css/lenya.css"/>
- </page:head>
-
<page:body>
<jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
<div id="contentblock1" class="lenya-tab">
Modified: lenya/trunk/src/modules-core/administration/usecases/reports.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/reports.jx?rev=738925&r1=738924&r2=738925&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/reports.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/reports.jx Thu Jan 29 16:50:05 2009
@@ -24,10 +24,6 @@
xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
>
- <page:head>
- <link rel="stylesheet" type="text/css" href="/modules/gui/css/lenya.css"/>
- </page:head>
-
<page:body>
<jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
<div id="contentblock1" class="lenya-tab">
Modified: lenya/trunk/src/modules-core/administration/usecases/users.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/users.jx?rev=738925&r1=738924&r2=738925&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/users.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/users.jx Thu Jan 29 16:50:05 2009
@@ -22,10 +22,6 @@
xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
>
- <page:head>
- <link rel="stylesheet" type="text/css" href="/modules/gui/css/lenya.css"/>
- </page:head>
-
<page:body>
<jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
<div id="contentblock1" class="lenya-tab">
Modified: lenya/trunk/src/modules-core/gui/resources/css/default.css
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/gui/resources/css/default.css?rev=738925&r1=738924&r2=738925&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/gui/resources/css/default.css (original)
+++ lenya/trunk/src/modules-core/gui/resources/css/default.css Thu Jan 29 16:50:05 2009
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+@import url(lenya.css);
@import url(antlog.css);
@import url(forms.css);
@import url(tables.css);
@@ -109,12 +110,6 @@
font-weight: bold;
}
-div.lenya-error {
- padding: 5px;
- margin: 5px 0px;
- background-color: #FF9999;
-}
-
.lenya-page-subtitle {
background-color: #E5F5F8;
border-bottom: solid 1px #B1B1B1;
Modified: lenya/trunk/src/modules-core/gui/resources/css/lenya.css
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/gui/resources/css/lenya.css?rev=738925&r1=738924&r2=738925&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/gui/resources/css/lenya.css (original)
+++ lenya/trunk/src/modules-core/gui/resources/css/lenya.css Thu Jan 29 16:50:05 2009
@@ -1,5 +1,18 @@
@import url(listContainer.css);
+.lenyaInfoBox {
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ background-color: #DDDCCF;
+ margin: .5em 0;
+ padding: .5em .7em;
+}
+
+.lenyaInfoBox h3 {
+ font-size: small;
+ margin: 0 0 .2em 0;
+}
+
.lenyaButton {
cursor: pointer;
background: url('/modules/gui/images/button-background.gif') left top repeat-x;
@@ -25,4 +38,22 @@
a img {
border: none;
+}
+
+ul.lenyaMessages {
+ list-style-type: none;
+ margin: 0;
+ padding: 0;
+}
+
+ul.lenyaMessages li {
+ padding-left: 20px;
+}
+
+li.lenyaErrorMessage {
+ background: url('/modules/gui/icons/sweetie/base/16-circle-red-remove.png') left 1px no-repeat;
+}
+
+li.lenyaInfoMessage {
+ background: url('/modules/gui/icons/sweetie/base/16-message-info.png') left 1px no-repeat;
}
\ No newline at end of file
Modified: lenya/trunk/src/modules-core/usecase/templates/messages.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/templates/messages.jx?rev=738925&r1=738924&r2=738925&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/usecase/templates/messages.jx (original)
+++ lenya/trunk/src/modules-core/usecase/templates/messages.jx Thu Jan 29 16:50:05 2009
@@ -6,9 +6,9 @@
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,46 +19,43 @@
<!-- $Id$ -->
<jx:template name="messages"
- xmlns:jx="http://apache.org/cocoon/templates/jx/1.0"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:i18n="http://apache.org/cocoon/i18n/2.1" >
-
+ xmlns:jx="http://apache.org/cocoon/templates/jx/1.0"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:i18n="http://apache.org/cocoon/i18n/2.1" >
+
<!--
- Note: in current implementation, ${usecase} refers to an
- instance of UsecaseProxy, not of Usecase !
- -->
+ Note: in current implementation, ${usecase} refers to an
+ instance of UsecaseProxy, not of Usecase !
+ -->
<jx:if test="${usecase.hasErrors() || usecase.hasInfoMessages()}">
- <div class="lenya-error">
- <ul>
-
+ <div class="lenyaInfoBox">
+ <ul class="lenyaMessages">
<jx:forEach var="message" items="${usecase.getErrorMessages()}">
- <li>
+ <li class="lenyaErrorMessage">
<i18n:translate>
<i18n:text><jx:out value="${message.getMessage()}"/></i18n:text>
- <jx:if test="${message.hasParameters()}">
- <jx:forEach var="param" items="${message.getParameters()}">
- <i18n:param><jx:out value="${param}"/></i18n:param>
- </jx:forEach>
- </jx:if>
+ <jx:if test="${message.hasParameters()}">
+ <jx:forEach var="param" items="${message.getParameters()}">
+ <i18n:param><jx:out value="${param}"/></i18n:param>
+ </jx:forEach>
+ </jx:if>
</i18n:translate>
</li>
</jx:forEach>
-
<jx:forEach var="message" items="${usecase.getInfoMessages()}">
- <li>
+ <li class="lenyaInfoMessage">
<i18n:translate>
<i18n:text><jx:out value="${message.getMessage()}"/></i18n:text>
- <jx:if test="${message.hasParameters()}">
- <jx:forEach var="param" items="${message.getParameters()}">
- <i18n:param><jx:out value="${param}"/></i18n:param>
- </jx:forEach>
- </jx:if>
+ <jx:if test="${message.hasParameters()}">
+ <jx:forEach var="param" items="${message.getParameters()}">
+ <i18n:param><jx:out value="${param}"/></i18n:param>
+ </jx:forEach>
+ </jx:if>
</i18n:translate>
</li>
</jx:forEach>
-
</ul>
</div>
</jx:if>
-
+
</jx:template>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org