incubator-esme-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhir...@apache.org
Subject svn commit: r933103 - in /incubator/esme/trunk/server/src/main/webapp: action_view/ auth_view/ info_view/ scripts/ track_view/
Date Mon, 12 Apr 2010 06:21:52 GMT
Author: rhirsch
Date: Mon Apr 12 06:21:52 2010
New Revision: 933103

URL: http://svn.apache.org/viewvc?rev=933103&view=rev
Log:
[ESME-127] Remove sorting from tables where it doesn't make sense
[ESME-126] Remove delete icons from tables

Added:
    incubator/esme/trunk/server/src/main/webapp/scripts/esme_table_sorter_action.js
    incubator/esme/trunk/server/src/main/webapp/scripts/esme_table_sorter_token.js
    incubator/esme/trunk/server/src/main/webapp/scripts/esme_table_sorter_track.js
    incubator/esme/trunk/server/src/main/webapp/scripts/esme_table_sorter_users.js
Modified:
    incubator/esme/trunk/server/src/main/webapp/action_view/index.html
    incubator/esme/trunk/server/src/main/webapp/auth_view/index.html
    incubator/esme/trunk/server/src/main/webapp/info_view/users.html
    incubator/esme/trunk/server/src/main/webapp/track_view/index.html

Modified: incubator/esme/trunk/server/src/main/webapp/action_view/index.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/action_view/index.html?rev=933103&r1=933102&r2=933103&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/action_view/index.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/action_view/index.html Mon Apr 12 06:21:52
2010
@@ -18,7 +18,6 @@
 -->
 
 <lift:surround with="base" at="left">
-	<lift:TableSorterSnip/>
 <head>
 	<!-- STYLESHEETS  -->  
 	<link type="text/css" href="../style/jqueryui-theme/jquery-ui-1.7.2.custom.css" rel="stylesheet"
/>     
@@ -27,10 +26,14 @@
 	<script type="text/javascript" src="../scripts/jquery-ui-1.7.2.custom.min.js">   
</script>
 	<script type="text/javascript" src="../scripts/dialog_action.js">    </script>
 		<lift:TableSorterSnip/>
+		    <script type="text/javascript" src="../scripts/esme.js">
+    </script>
+    <script type="text/javascript" src="../scripts/esme_table_sorter_action.js"></script>
 	</head>
 	
-<div class="demo">
- <div id="messages" class="esme_message_bar"></div>
+<div id="back-header">
+	<h1><lift:loc>ui_action_title</lift:loc></h1>
+<div class="container-settings">
 				<span id="TokenSpan">
 					<lift:ignore>
 						<!--      The displayActions snippet *MUST* appear on the page before      the main
snippet      -->
@@ -106,13 +109,19 @@
        </form>
 </div>
 
-		<button onclick="javascript:$('#dialog-form').dialog('open')" id="create-user">
+<div class="post-form-row">
+								<div class="submit-btn">
+<button onclick="javascript:$('#dialog-form').dialog('open')" id="create-user">
 			<lift:loc>ui_action_new_action_add</lift:loc>
-		</button>
+		</button>								</div>
+							</div>
 
+		
 
 
 
+
+</div><!-- End demo -->
 </div><!-- End demo -->
 
 

Modified: incubator/esme/trunk/server/src/main/webapp/auth_view/index.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/auth_view/index.html?rev=933103&r1=933102&r2=933103&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/auth_view/index.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/auth_view/index.html Mon Apr 12 06:21:52 2010
@@ -25,11 +25,13 @@
 		<script type="text/javascript" src="../scripts/jquery-ui-1.7.2.custom.min.js">  
 </script>
 		<script type="text/javascript" src="../scripts/dialog_token.js">    </script>
 		<lift:TableSorterSnip/>
+		    <script type="text/javascript" src="../scripts/esme.js">
+    </script>
+    <script type="text/javascript" src="../scripts/esme_table_sorter_token.js"></script>
 	</head>
 	<div id="back-header">
 	<h1><lift:loc>ui_token_title</lift:loc></h1>
 	<div class="container-settings">
-		<div id="messages" class="esme_message_bar"></div>
 		<span id="TokenSpan">
 			<lift:ignore>
 				<!--                        The displayTokens snippet *MUST* appear on the page before
                       the main snippet                        -->
@@ -73,7 +75,7 @@
 				</table>
 			</lift:displayTokens>
 		</span>
-		<div id="dialog-form" title="Create new token">
+		<div id="dialog-form" style="display: none" title="Create new token">
 			<p class="validateTips">
 				<lift:loc>ui_form_all_fields_required</lift:loc>
 			</p>
@@ -88,9 +90,12 @@
 				</lift:main>
 			</form>
 		</div>
-		<button onclick="javascript:$('#dialog-form').dialog('open')" id="create-user">
+		<div class="post-form-row">
+								<div class="submit-btn">
+<button onclick="javascript:$('#dialog-form').dialog('open')" id="create-user">
 			<lift:loc>ui_token_title_create</lift:loc>
-		</button>
+		</button>								</div>
+							</div>
 	</div>
 	</div>
 	<!-- End demo -->

Modified: incubator/esme/trunk/server/src/main/webapp/info_view/users.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/info_view/users.html?rev=933103&r1=933102&r2=933103&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/info_view/users.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/info_view/users.html Mon Apr 12 06:21:52 2010
@@ -18,7 +18,7 @@
 -->
 <lift:surround with="base" at="left">
     <link rel="stylesheet" type="text/css" href="../style/style.css"/>
-    <script type="text/javascript" src="../scripts/esme_table_sorter.js"></script>
+    <script type="text/javascript" src="../scripts/esme_table_sorter_users.js"></script>
     <lift:TableSorterSnip/>
     <div id="back-header">
       <h1><b><lift:loc>ui_user_list_title</lift:loc></b></h1>

Added: incubator/esme/trunk/server/src/main/webapp/scripts/esme_table_sorter_action.js
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/scripts/esme_table_sorter_action.js?rev=933103&view=auto
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/scripts/esme_table_sorter_action.js (added)
+++ incubator/esme/trunk/server/src/main/webapp/scripts/esme_table_sorter_action.js Mon Apr
12 06:21:52 2010
@@ -0,0 +1,26 @@
+/*
+ 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.                                           *
+*/
+
+$(document).ready(function() 
+    { 
+        $("#esme-table").tablesorter({ headers: { 5: { sorter: false} } }); 
+    } 
+); 
+   
+

Added: incubator/esme/trunk/server/src/main/webapp/scripts/esme_table_sorter_token.js
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/scripts/esme_table_sorter_token.js?rev=933103&view=auto
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/scripts/esme_table_sorter_token.js (added)
+++ incubator/esme/trunk/server/src/main/webapp/scripts/esme_table_sorter_token.js Mon Apr
12 06:21:52 2010
@@ -0,0 +1,26 @@
+/*
+ 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.                                           *
+*/
+
+$(document).ready(function() 
+    { 
+      $("#esme-table").tablesorter({ headers: { 1: { sorter: false}, 3: {sorter: false} }
}); 
+    } 
+); 
+   
+

Added: incubator/esme/trunk/server/src/main/webapp/scripts/esme_table_sorter_track.js
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/scripts/esme_table_sorter_track.js?rev=933103&view=auto
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/scripts/esme_table_sorter_track.js (added)
+++ incubator/esme/trunk/server/src/main/webapp/scripts/esme_table_sorter_track.js Mon Apr
12 06:21:52 2010
@@ -0,0 +1,26 @@
+/*
+ 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.                                           *
+*/
+
+$(document).ready(function() 
+    { 
+        $("#esme-table").tablesorter({ headers: { 2: { sorter: false} } }); 
+    } 
+); 
+   
+

Added: incubator/esme/trunk/server/src/main/webapp/scripts/esme_table_sorter_users.js
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/scripts/esme_table_sorter_users.js?rev=933103&view=auto
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/scripts/esme_table_sorter_users.js (added)
+++ incubator/esme/trunk/server/src/main/webapp/scripts/esme_table_sorter_users.js Mon Apr
12 06:21:52 2010
@@ -0,0 +1,26 @@
+/*
+ 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.                                           *
+*/
+
+$(document).ready(function() 
+    { 
+      $("#esme-table").tablesorter({ headers: { 0: { sorter: false} } }); 
+    } 
+); 
+   
+

Modified: incubator/esme/trunk/server/src/main/webapp/track_view/index.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/track_view/index.html?rev=933103&r1=933102&r2=933103&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/track_view/index.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/track_view/index.html Mon Apr 12 06:21:52
2010
@@ -25,9 +25,14 @@
 	<script type="text/javascript" src="../scripts/jquery-ui-1.7.2.custom.min.js">   
</script>
 	<script type="text/javascript" src="../scripts/dialog_track.js">    </script>
 		<lift:TableSorterSnip/>
+		    <script type="text/javascript" src="../scripts/esme.js">
+    </script>
+    <script type="text/javascript" src="../scripts/esme_table_sorter_track.js"></script>
 	</head>
 	
-<div class="demo">
+<div id="back-header">
+	<h1><lift:loc>ui_track_manage</lift:loc></h1>
+<div class="container-settings">
  <div id="messages"></div>
 
 <span id="TrackSpan">
@@ -45,7 +50,7 @@
 										<lift:loc>ui_track_manage_active</lift:loc>
 									</th>
 									<th>
-										<lift:loc>ui_track_manage_remove</lift:loc>
+										
 									</th>
 								</tr>
 							</thead>
@@ -58,9 +63,9 @@
 										<td>
 											<item:enabled/>
 										</td>
-										<td>
+										<td halign="center">
 											<item:remove>
-												<img src="/images/deletenew.png"/>
+												<img src="/images/cancel.png"/>
 											</item:remove>
 										</td>
 									</tr>
@@ -71,7 +76,7 @@
 				</span>
 
 
-<div id="dialog-form" title="Create new track">
+<div id="dialog-form" style="display: none" title="Create new track">
 	<p class="validateTips"><lift:loc>ui_form_all_fields_required</lift:loc></p>
 
        <form id="track_new_dialog" onsubmit="false">
@@ -85,8 +90,14 @@
        </form>
 </div>
 
+<div class="post-form-row">
+								<div class="submit-btn">
+								        <button onclick="javascript:$('#dialog-form').dialog('open')" id="create-user">Create
new track</button>
+								</div>
+							</div>
+
 
-<button onclick="javascript:$('#dialog-form').dialog('open')" id="create-user">Create
new track</button>
 
 </div><!-- End demo -->
+</div><!-- End demo -->
 </lift:surround>
\ No newline at end of file



Mime
View raw message