incubator-esme-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhir...@apache.org
Subject svn commit: r920738 - in /incubator/esme/branches/ui-2010-03-05/src/main: resources/ webapp/ webapp/WEB-INF/ webapp/templates-hidden/
Date Tue, 09 Mar 2010 08:45:13 GMT
Author: rhirsch
Date: Tue Mar  9 08:45:13 2010
New Revision: 920738

URL: http://svn.apache.org/viewvc?rev=920738&view=rev
Log:
[ESME-100] Finish web UI
Daily hour

Modified:
    incubator/esme/branches/ui-2010-03-05/src/main/resources/ESMECustom.properties
    incubator/esme/branches/ui-2010-03-05/src/main/webapp/WEB-INF/web.xml
    incubator/esme/branches/ui-2010-03-05/src/main/webapp/index.html
    incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/base.html
    incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/default.html
    incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/message.html
    incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/upw_login_form.html

Modified: incubator/esme/branches/ui-2010-03-05/src/main/resources/ESMECustom.properties
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/resources/ESMECustom.properties?rev=920738&r1=920737&r2=920738&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/resources/ESMECustom.properties (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/resources/ESMECustom.properties Tue Mar
 9 08:45:13 2010
@@ -17,4 +17,21 @@
  * under the License.
  */
 custom_mail_from_adress=esme@esme.apache.org
-custom_mail_subject=Message from ESME
\ No newline at end of file
+custom_mail_subject=Message from ESME
+
+custom_opening_main_title=Getting Started on ESME
+custom_opening_main_body=Apache Enterprise Social Messaging Experiment (ESME) is a secure
and highly scalable microsharing and micromessaging platform that allows people to discover
and meet one another and get controlled access to other sources of information, all in a business
process context.ESME is based on the idea that you - the user - decide what information is
useful for you.  There are various ways to discover what other users are posting information
that may be relevant for you 1) Use "Tracks" to follow terms that may be of interest for you,
2) Use the public timeline to find others who posts may be of interest 3) use the search functionto
find others who posts meet certain criterien, 4) post your thoughts, ideas, etc and others
with similar interests will enter into conversations with you
+
+custom_heading_1_title=ASF 
+custom_heading_1_body=Apache Software Foundation (ASF) provides support for the Apache community
of open-source software projects. 
+
+custom_heading_2_title=Apache Incubator 
+custom_heading_2_body=Incubator project is the entry path into The Apache Software Foundation
(ASF) for projects and codebases wishing to become part of the Foundation's efforts. 
+
+
+custom_heading_3_title=Microblogging 
+custom_heading_3_body=Microblogs differ from a traditional blogs in that their content is
typically much smaller, in both actual size and aggregate file size. 
+
+custom_text_link1=home
+custom_text_link2=getting started
+custom_text_link3=blog

Modified: incubator/esme/branches/ui-2010-03-05/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/WEB-INF/web.xml?rev=920738&r1=920737&r2=920738&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/WEB-INF/web.xml Tue Mar  9 08:45:13
2010
@@ -1,23 +1,4 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one   *
- or more contributor license agreements.  See the NOTICE file *
- distributed with this work for additional information        *
- regarding copyright ownership.  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                 *
-                                                              *
- 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.  See the License for the    *
- specific language governing permissions and limitations      *
- under the License.                                           *
--->
-
 
 <!DOCTYPE web-app
 PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
@@ -30,7 +11,7 @@ PUBLIC "-//Sun Microsystems, Inc.//DTD W
   <description>The Filter that intercepts lift calls</description>
   <filter-class>net.liftweb.http.LiftFilter</filter-class>
 </filter>
- 	
+ 
 <filter-mapping>
   <filter-name>LiftFilter</filter-name>
   <url-pattern>/*</url-pattern>

Modified: incubator/esme/branches/ui-2010-03-05/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/index.html?rev=920738&r1=920737&r2=920738&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/index.html (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/index.html Tue Mar  9 08:45:13 2010
@@ -7,9 +7,8 @@
           	<!---BLUE HEADER-->
 	<div id="container-2nd-level-bg">
 		<div id="container-2nd-level">
-		       <h1><span>Getting Started on ESME</span></h1>
-		       Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec interdum mauris eu
est faucibus laoreet. Maecenas pulvinar ornare eros non hendrerit. Aliquam rutrum, mauris
ut consectetur placerat, magna neque pulvinar eros, sed pretium purus turpis fermentum ligula.
Vestibulum erat elit, dictum non hendrerit in, aliquet posuere augue. Aliquam mauris dolor,
luctus sit amet luctus vitae, viverra tempor est. Donec metus lorem, hendrerit in venenatis
ac.
-			  		<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec interdum mauris
eu est faucibus laoreet. </p>
+		       <h1><span><lift:loc>custom_opening_main_title</lift:loc></span></h1>
+		       <p><lift:loc>custom_opening_main_body</lift:loc> </p>
 		</div><!--container-2nd-level-->
 	</div><!--container-2nd-level-bg-->
 	<!--END BLUE HEADER-->	
@@ -24,7 +23,7 @@
 			<div class="tag"><a href="">mac</a>, <a href="">design</a>,
<a href="">graphics</a>, <a href="">photoshop</a>, <a href="">cs3</a></div>

 			<div class="info"><a href="">Nickname</a> 3 hours ago</div>
 		</div>
-	</div><!--gray-box-->
+	</div><!--gray-box
 	
 	<div class="tags-box">
 		<a href="" class="style5">software</a> 
@@ -48,7 +47,7 @@
 		<a href="" class="style4">tutorials</a> 
 		<a href="" class="style1">articles</a> 
 		<a href="" class="style4">jQuery samples</a>
-	</div>
+	</div> -->
         </lift:surround>
     </logged:out>
 </lift:UserSnip.loggedIn>
\ No newline at end of file

Modified: incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/base.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/base.html?rev=920738&r1=920737&r2=920738&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/base.html (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/base.html Tue Mar
 9 08:45:13 2010
@@ -151,15 +151,13 @@
         </div>
         <!--// ENDS CONTAINER-BG -->
         <div id="footer">
-            <div class="ftr-links">
-                <a href="index.html">home</a>
-                |<a href="services.html">services</a>
-                |<a href="mission.html">mission</a>
-                |
-                <br/>
-                Copyright &copy; 2009 ESME
-                <br/>
-            </div>
-        </div>
+                <div class="ftr-links">			
+				<a href="http://cwiki.apache.org/confluence/display/ESME/Index"><lift:loc>custom_text_link1</lift:loc></a>
|
+				<a href="http://cwiki.apache.org/confluence/display/ESME/Index#Index-GettingStarted"><lift:loc>custom_text_link2</lift:loc></a>
|
+				<a href="http://blog.esme.us/"><lift:loc>custom_text_link3</lift:loc></a>
|
+				<br />
+                <lift:loc>ui_default_footer</lift:loc>
+          <br />
+         </div> 
     </body>
 </html>

Modified: incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/default.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/default.html?rev=920738&r1=920737&r2=920738&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/default.html (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/default.html Tue
Mar  9 08:45:13 2010
@@ -35,9 +35,9 @@
         </div><!--// ENDS CONTAINER-BG -->
         <div class="footer">
             <div class="ftr-links">			
-				<a href="index.html">home</a> |
-				<a href="services.html">services</a> |
-				<a href="mission.html">mission</a> |
+				<a href="http://cwiki.apache.org/confluence/display/ESME/Index"><lift:loc>custom_text_link1</lift:loc></a>
|
+				<a href="http://cwiki.apache.org/confluence/display/ESME/Index#Index-GettingStarted"><lift:loc>custom_text_link2</lift:loc></a>
|
+				<a href="http://blog.esme.us/"><lift:loc>custom_text_link3</lift:loc></a>
|
 				<br />
                 <lift:loc>ui_default_footer</lift:loc>
           <br />

Modified: incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/message.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/message.html?rev=920738&r1=920737&r2=920738&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/message.html (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/message.html Tue
Mar  9 08:45:13 2010
@@ -109,7 +109,7 @@
                             </div>
                             <div id="body">-</div>
                             <div class="time">
-                                <div id="pool"> -</div> <div id="when">
-</div> <div id="reason"> -</div> <div id="source"> -</div>

+                                <table><tr><td><div id="pool"> -</div></td><td>
  </td><td> <div id="when"> -</div></td><td><div id="reason">
-</div></td><td> <div id="source"> -</div></td></tr></table>
                             </div>
                             <div id="tags" class="tags">
                                 <p id="tag">
@@ -240,15 +240,14 @@
         </div>
         <!--// ENDS CONTAINER-BG -->
         <div id="footer">
-            <div class="ftr-links">
-                <a href="index.html">home</a>
-                |<a href="services.html">services</a>
-                |<a href="mission.html">mission</a>
-                |
-                <br/>
-                Copyright &copy; 2009 ESME
-                <br/>
-            </div>
+            <div class="ftr-links">			
+				<a href="http://cwiki.apache.org/confluence/display/ESME/Index"><lift:loc>custom_text_link1</lift:loc></a>
|
+				<a href="http://cwiki.apache.org/confluence/display/ESME/Index#Index-GettingStarted"><lift:loc>custom_text_link2</lift:loc></a>
|
+				<a href="http://blog.esme.us/"><lift:loc>custom_text_link3</lift:loc></a>
|
+				<br />
+                <lift:loc>ui_default_footer</lift:loc>
+          <br />
+         </div> 
         </div>
     </body>
 </html>

Modified: incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/upw_login_form.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/upw_login_form.html?rev=920738&r1=920737&r2=920738&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/upw_login_form.html
(original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/upw_login_form.html
Tue Mar  9 08:45:13 2010
@@ -30,17 +30,13 @@
 		</div>
 		<div class="bot-login"></div>
 		<div class="box-right">
-                        <!--<div class="headingl"></div>
-                        <h3>Heading Section A</h3>
-                        <div class="headingr"></div>--><h3><a href="">Heading
Section A</a></h3>
-                        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus
at odio vitae justo ultricies porttitor sit amet nec justo. Nam dictum sodales purus. 
-                    </div>
+                        <h3><a href="http://www.apache.org/"><lift:loc>custom_heading_1_title</lift:loc></a></h3>
+                       <p><lift:loc>custom_heading_1_body</lift:loc></p>
+                       </div>
                     <div class="box-right">
-                        <h3><a href="">Heading Section B</a></h3>
-                        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus
at odio vitae justo ultricies porttitor sit amet nec justo. Nam dictum sodales purus. 
-                    </div>
+                        <h3><a href="http://incubator.apache.org/"><lift:loc>custom_heading_2_title</lift:loc></a></h3>
+                        <lift:loc>custom_heading_2_body</lift:loc></div>
                     <div class="box-right">
-                        <h3><a href="">Heading Section C</a></h3>
-                        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus
at odio vitae justo ultricies porttitor sit amet nec justo. Nam dictum sodales purus. 
-                    </div>
+                        <h3><a href="http://en.wikipedia.org/wiki/Microblogging"><lift:loc>custom_heading_3_title</lift:loc></a></h3>
+                        <lift:loc>custom_heading_3_body</lift:loc></div>
 	</div><!--login-box-->
\ No newline at end of file



Mime
View raw message