esme-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhir...@apache.org
Subject svn commit: r836261 - in /incubator/esme/trunk/server/src/main: resources/ESMEUI.properties webapp/templates-hidden/message.html
Date Sat, 14 Nov 2009 20:45:29 GMT
Author: rhirsch
Date: Sat Nov 14 20:45:28 2009
New Revision: 836261

URL: http://svn.apache.org/viewvc?rev=836261&view=rev
Log:
[ESME-40] Static Texts in Resource File
Also made search active again - although it still doesn't work

Modified:
    incubator/esme/trunk/server/src/main/resources/ESMEUI.properties
    incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html

Modified: incubator/esme/trunk/server/src/main/resources/ESMEUI.properties
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/resources/ESMEUI.properties?rev=836261&r1=836260&r2=836261&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/resources/ESMEUI.properties (original)
+++ incubator/esme/trunk/server/src/main/resources/ESMEUI.properties Sat Nov 14 20:45:28 2009
@@ -11,6 +11,7 @@
 ui_login_email=Email
 ui_login_password=Password
 ui_login_password_repeat=Password (retype) 
+ui_login_login=Login
 
 ui_default_conversation=Conversation
 ui_default_footer=Apache ESME 2009 - An Apache Incubator Project
@@ -28,6 +29,7 @@
 ui_pool_list_user_role=Role
 ui_pool_edit_label=Select Pool
 ui_pool_edit_name=User
+ui_pool_edit_edit=Edit
 ui_pool_title_details=Pool Details: 
 ui_pool_list_users=Users in Pool
 ui_pool_add_user=Add User to Pool
@@ -46,6 +48,7 @@
 ui_action_new_action_name=Name
 ui_action_new_action_test=Test
 ui_action_new_action_action=Action
+ui_action_new_action_add=Add
 ui_action_new_action_add=Create
 ui_action_help=Help
 
@@ -66,6 +69,7 @@
 ui_token_title_manage=Manage your tokens 
 ui_token_title_create=Create a token 
 ui_token_revoke=Revoke
+ui_token_add=Add
 ui_token_name=Name
 ui_token_list_title=Valid Tokens
 ui_token_list_token=Token 
@@ -125,6 +129,7 @@
 ui_messages_message_label_popular_links=Popular links
 ui_messages_message_header_popular_links_clicked=Clicked 
 ui_messages_message_header_popular_links_link=Link 
+ui_messages_search=Search
 
 ui_track_manage=Manage your tracks
 ui_track_manage_active=Active
@@ -132,6 +137,7 @@
 ui_track_manage_track=Track
 ui_track_new_track=Create new track
 ui_track_new_track_what=What do you want to track?
+ui_track_new_track_add=Add
 
 ui_tag_title=Tag 
 ui_tag_author=Author

Modified: incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html?rev=836261&r1=836260&r2=836261&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html Sat Nov 14 20:45:28
2009
@@ -73,29 +73,29 @@
                                                             <td>
                                                                 <img id="avatar" src="/images/avatar.jpg"
alt="Anonymous" width="50px"/>
                                                                 <div id="author">
-                                                                    anon
+                                                                    -
                                                                 </div>
                                                             </td>
                                                             <td class="message">
                                                                 <div class="outer">
                                                                     <div class="inner
clear">
                                                                         <p class="text"
id="body">
-                                                                            This is a test
message in the HTML for designers.
+                                                                            -
                                                                         </p>
                                                                     </div>
                                                                     <div class="metainfo">
-                                                                        <span id="pool">in
pool PUBLIC</span>
-                                                                        <span id="reason">resent
by me</span>
-                                                                        <span id="when"
class="date">today</span>
+                                                                        <span id="pool">-</span>
+                                                                        <span id="reason">-</span>
+                                                                        <span id="when"
class="date">-</span>
                                                                     </div>
                                                                 </div>
                                                             </td>
                                                             <td id="tags" class="tag">
                                                                 <p id="tag">
-                                                                    <a href="tag/tag1">tag1</a>
+                                                                    <a href="tag/tag1">-</a>
                                                                 </p>
                                                                 <p id="tag">
-                                                                    <a href="tag/tag2">tag2</a>
+                                                                    <a href="tag/tag2">-</a>
                                                                 </p>
                                                             </td>
                                                             <td>
@@ -140,29 +140,29 @@
                                                             <td>
                                                                 <img id="avatar" src="/images/avatar.jpg"
alt="Anonymous" width="50px"/>
                                                                 <div id="author">
-                                                                    anon
+                                                                    -
                                                                 </div>
                                                             </td>
                                                             <td class="message">
                                                                 <div class="outer">
                                                                     <div class="inner
clear">
                                                                         <p class="text"
id="body">
-                                                                            This is a test
message in the HTML for designers.
+                                                                            -
                                                                         </p>
                                                                     </div>
                                                                     <div class="metainfo">
-                                                                        <span id="pool">in
pool PUBLIC</span>
-                                                                        <span id="reason">resent
by me</span>
-                                                                        <span id="when"
class="date">today</span>
+                                                                        <span id="pool">-</span>
+                                                                        <span id="reason">-</span>
+                                                                        <span id="when"
class="date">-</span>
                                                                     </div>
                                                                 </div>
                                                             </td>
                                                             <td id="tags" class="tag">
                                                                 <p id="tag">
-                                                                    <a href="tag/tag1">tag1</a>
+                                                                    <a href="tag/tag1">-</a>
                                                                 </p>
                                                                 <p id="tag">
-                                                                    <a href="tag/tag2">tag2</a>
+                                                                    <a href="tag/tag2">-</a>
                                                                 </p>
                                                             </td>
                                                         </tr>
@@ -171,19 +171,6 @@
                                             </div>
                                         </dd>
                                     </dl>
-                                    <dl class="contacts">
-                                        <dt class="caption">
-                                            <lift:loc>ui_messages_message_label_contacts</lift:loc>
-                                        </dt>
-                                        <dd class="b-contacts" style="height: 240px; overflow:
auto">
-                                            <lift:loc>ui_messages_message_label_following</lift:loc>
-                                            <lift:UserSnip.following/>
-                                        </dd>
-                                        <dd class="b-contacts" style="height: 240px; overflow:
auto">
-                                            <lift:loc>ui_messages_message_label_followers</lift:loc>
-                                            <lift:UserSnip.followers/>
-                                        </dd>
-                                    </dl>
                                 </div>
                             </div>
                         </td>
@@ -202,7 +189,7 @@
                                         <lift:loc>ui_messages_message_label_message_reply</lift:loc>
                                         <span id="reply-to-span">&nbsp;</span>
                                         <button onclick="clearReplyTo()">
-                                            remove reply
+                                            <lift:loc>ui_messages_message_label_message_remove_reply</lift:loc>
                                         </button>
                                     </div>
                                     <div class="row clear" style="display: none">
@@ -226,7 +213,7 @@
                                     </div>
                                     <div class="row clear">
                                         <button class="btn" onclick="javascript:post_msg();">
-                                            Update<!--<img src="/images/send-message.png"
alt="Send Message" />-->
+                                            <lift:loc>ui_messages_message_update</lift:loc>
                                         </button>
                                     </div>
                                     <script>
@@ -317,13 +304,14 @@
                                         </table>
                                     </lift:UserSnip.links>
                                 </div>
-                                <lift:ignore>
                                     <div class="bugs">
                                         <form action="/user_view/search" class="b-primay">
-                                            <input style="height: 20px; background: #c9d8ea;"
name="term"/><input style="height: 22px; background: #233e5e; color: #c9d8ea;" type="submit"
value="Search"/>
+                                            <input style="height: 20px; background: #c9d8ea;"
name="term"/>
+                                          <button class="btn" onclick="javascript:form.submit();">
+                                            <lift:loc>ui_messages_search</lift:loc>
+                                        </button>                                 
        
                                         </form>
                                     </div>
-                                </lift:ignore>
                             </div>
                         </td>
                     </tr>



Mime
View raw message