SAK-34068 - Improve responsiveness in admin tools

BruceMcl · Apr 10, 2018 · a40f64d · a40f64d
1 parent bd88746
commit a40f64d
Show file tree

Hide file tree

Showing 13 changed files with 55 additions and 59 deletions.
diff --git a/admin-tools/src/webapp/vm/authz/chef_realms_list.vm b/admin-tools/src/webapp/vm/authz/chef_realms_list.vm
@@ -60,7 +60,7 @@
 
 #if ($realms.size() > 0)
 	#set ($realmCount = 0)
-		<table class="listHier lines" cellspacing="0" summary ="$tlang.getString("realm.list.summary")">
+		<table class="table table-hover table-striped table-bordered" summary ="$tlang.getString("realm.list.summary")">
 			<tr>
 				<th id="Id">$tlang.getString("realm.list.realmid")</th>
 ##				<th id="Description">$tlang.getString("realm.list.used")</th>
@@ -70,7 +70,6 @@
 	#foreach ($realm in $realms)
 			<tr>
 				<td headers="Id">
-					<h4>
 						#if ($service.allowUpdate($realm.Id))
 							<a href="#toolLinkParam("$action" "doEdit" "id=$validator.escapeUrl($realm.Id)")" title="$tlang.getString("realm.edit.edit") $validator.escapeHtml($realm.Id)">
 								$validator.escapeHtml($realm.Id)
@@ -82,7 +81,6 @@
 						#else
 							$validator.escapeHtml($realm.Id)
 						#end
-					</h4>	
 				</td>
 ##				<td headers="Description">$!validator.escapeHtml($!realm.Description)</td>
 				<td headers="Provider">$!validator.escapeHtml($!realm.ProviderGroupId)</td>

diff --git a/jobscheduler/scheduler-tool/src/webapp/scheduler/edit_properties.jsp b/jobscheduler/scheduler-tool/src/webapp/scheduler/edit_properties.jsp
@@ -20,7 +20,7 @@
                     <sakai:panel_edit>
                         <h:dataTable value="#{schedulerTool.configurableProperties}"
                                      var="prop"
-                                     styleClass="table table-striped">
+                                     styleClass="table table-hover table-striped table-bordered">
                             <h:column>
                                 <f:facet name="header">
                                     <h:outputText value="#{msgs.properties_name_header}"/>

diff --git a/jobscheduler/scheduler-tool/src/webapp/scheduler/edit_runnow_properties.jsp b/jobscheduler/scheduler-tool/src/webapp/scheduler/edit_runnow_properties.jsp
@@ -24,7 +24,7 @@
                     <sakai:panel_edit>
                         <h:dataTable id="propertyTable" value="#{schedulerTool.configurableProperties}"
                                      var="prop"
-                                     styleClass="table table-striped">
+                                     styleClass="table table-hover table-striped table-bordered">
                             <h:column>
 
                                 <f:facet name="header">

diff --git a/jobscheduler/scheduler-tool/src/webapp/scheduler/edit_trigger_properties.jsp b/jobscheduler/scheduler-tool/src/webapp/scheduler/edit_trigger_properties.jsp
@@ -20,7 +20,7 @@
                     <sakai:panel_edit>
                         <h:dataTable value="#{schedulerTool.configurableProperties}"
                                      var="prop"
-                                     styleClass="table table-striped">
+                                     styleClass="table table-hover table-striped table-bordered">
                             <h:column>
                                 <f:facet name="header">
                                     <h:outputText value="#{msgs.properties_name_header}"/>

diff --git a/jobscheduler/scheduler-tool/src/webapp/scheduler/edit_triggers.jsp b/jobscheduler/scheduler-tool/src/webapp/scheduler/edit_triggers.jsp
@@ -24,8 +24,9 @@
 		     action="#{schedulerTool.processRefreshJobs}"
 			   value="#{msgs.bar_return_jobs}" />
    	  </sakai:tool_bar>
+   	  <br/>
    	  <sakai:view_content>
-  	    <h:dataTable rendered="#{!empty schedulerTool.selectedJobDetailWrapper.triggerWrapperList}" value="#{schedulerTool.selectedJobDetailWrapper.triggerWrapperList}" var="wrapper" styleClass="table table-striped">
+  	    <h:dataTable rendered="#{!empty schedulerTool.selectedJobDetailWrapper.triggerWrapperList}" value="#{schedulerTool.selectedJobDetailWrapper.triggerWrapperList}" var="wrapper" styleClass="table table-hover table-striped table-bordered">
   	      <h:column>
     	      <f:facet name="header">    	      
     	        <h:commandButton alt="SelectAll" image="/scheduler-tool/images/checkbox.gif" action="#{schedulerTool.processSelectAllTriggers}"/>    	        

diff --git a/jobscheduler/scheduler-tool/src/webapp/scheduler/jobs.jsp b/jobscheduler/scheduler-tool/src/webapp/scheduler/jobs.jsp
@@ -26,7 +26,7 @@
    	  </sakai:tool_bar>
    	  <br/>
    	  <sakai:view_content>
-  	    <h:dataTable value="#{schedulerTool.jobDetailWrapperList}" var="job" styleClass="table table-striped">
+  	    <h:dataTable value="#{schedulerTool.jobDetailWrapperList}" var="job" styleClass="table table-hover table-striped table-bordered">
   	      <h:column>
     	      <f:facet name="header">    	      
     	        <h:commandButton alt="SelectAll" image="images/checkbox.gif" action="#{schedulerTool.processSelectAllJobs}"/>

diff --git a/jobscheduler/scheduler-tool/src/webapp/scheduler/main.jsp b/jobscheduler/scheduler-tool/src/webapp/scheduler/main.jsp
@@ -37,7 +37,7 @@
 
   	      <h:dataTable
                     rows="#{schedulerTool.eventPager.pageSize}"
-                    value="#{schedulerTool.eventPager.events}" var="event" styleClass="table table-striped">
+                    value="#{schedulerTool.eventPager.events}" var="event" styleClass="table table-hover table-striped table-bordered">
   	        <h:column>
     	        <f:facet name="header">
     	          <h:outputText value="#{msgs.job_name}"/>

diff --git a/jobscheduler/scheduler-tool/src/webapp/scheduler/runningJobs.jsp b/jobscheduler/scheduler-tool/src/webapp/scheduler/runningJobs.jsp
@@ -22,7 +22,7 @@
    	  </sakai:tool_bar>
    	  <sakai:view_content>
    	  	<h:messages warnClass="warningMessage" infoClass="information"/>
-  	    <h:dataTable value="#{schedulerTool.runningJobs}" var="job" styleClass="table table-striped">
+  	    <h:dataTable value="#{schedulerTool.runningJobs}" var="job" styleClass="table table-hover table-striped table-bordered">
   	      <h:column>
     	      <f:facet name="header">
     	        <h:outputText value="#{msgs.job_name}"/>

diff --git a/presence/presence-tool/tool/src/webapp/vm/presence/chef_presence-List.vm b/presence/presence-tool/tool/src/webapp/vm/presence/chef_presence-List.vm
@@ -11,38 +11,37 @@
 			$tlang.getFormattedMessage("presence.list1.alert.message", $validator.escapeHtml($alertMessage))
 		</div>
 	#end
-	<table class="listHier lines" cellspacing="0" summary ="$tlang.getString("presence.list1.tablesummary")" border="0">
+	<table class="table table-hover table-striped table-bordered" summary ="$tlang.getString("presence.list1.tablesummary")" border="0">
 		#foreach ($location in $locations)
 			#set($list = $service.getPresence($location))
 			<tr class="highLightRow">
 				<td>
 					$list.size()
 				</td>
 				<td colspan="5">
-					<h4>$tlang.getFormattedMessage("presence.list1.location.value", $validator.escapeHtml($location))</h4>
+					$tlang.getFormattedMessage("presence.list1.location.value", $validator.escapeHtml($location))
 				</td>
 			</tr>
 			#foreach($entry in $list)
 				<tr>
 					<td>
 					</td>
 					<td>
-						<h5><span title="$tlang.getString("presence.session.name")">$validator.escapeHtml($entry.UserDisplayId)</span></h5>
+						<span title="$tlang.getString("presence.session.name")">$validator.escapeHtml($entry.UserDisplayId)</span>
 					</td>
-					<td>
+					<td class="hidden-xs">
 						<span title="$tlang.getString("presence.session.session")">$validator.escapeHtml($entry.Id)</span>
 					</td>
 					<td>
 						<span title="$tlang.getString("presence.session.adress")">$validator.escapeHtml($entry.IpAddress)</span>
 					</td>
-				<td>
-					<span title="$tlang.getString("presence.session.agent")" class="textPanelFooter">$validator.escapeHtml($entry.UserAgent)</span>
-				</td>
-				<td>
-					<span title="$tlang.getString("presence.session.started")">$validator.escapeHtml($entry.getStart().toStringLocalFull())</span>
-				</td>
-			</tr>	
-
+					<td class="hidden-xs">
+						<span title="$tlang.getString("presence.session.agent")" class="textPanelFooter">$validator.escapeHtml($entry.UserAgent)</span>
+					</td>
+					<td>
+						<span title="$tlang.getString("presence.session.started")">$validator.escapeHtml($entry.getStart().toStringLocalFull())</span>
+					</td>
+				</tr>
 			#end
 		#end
 	</table>

diff --git a/presence/presence-tool/tool/src/webapp/vm/presence/chef_presence.servers-List.vm b/presence/presence-tool/tool/src/webapp/vm/presence/chef_presence.servers-List.vm
@@ -8,7 +8,7 @@
 	</h3>
 	#if ($alertMessage)<div class="alertMessage">$tlang.getFormattedMessage("presence.list.alert.message", $validator.escapeHtml($alertMessage))</div>#end
 	<div class="instruction">$tlang.getFormattedMessage("presence.list.total.withValue", $total)</div>
-	<table class ="listHier lines nolines" cellspacing="0" summary ="$tlang.getString("presence.list.server.summary")">
+	<table class="table table-hover table-striped table-bordered" summary ="$tlang.getString("presence.list.server.summary")">
 			<tr>
 				<th id="Id">$tlang.getString("presence.list.server")</th>
 				<th id="Count">$tlang.getString("presence.list.sessions")</th>
@@ -17,9 +17,7 @@
 		#foreach ($serverName in $serverList)
 			<tr>
 				<td headers="Id">
-					<h4>
 						$validator.escapeHtml($serverName)
-					</h4>
 				</td>
 				<td headers="Count">
 					$!serverSessions.get($serverName).size()

diff --git a/presence/presence-tool/tool/src/webapp/vm/presence/chef_presence.sessions-List.vm b/presence/presence-tool/tool/src/webapp/vm/presence/chef_presence.sessions-List.vm
@@ -8,7 +8,7 @@
 	</h3>
 	#if ($alertMessage)<div class="alertMessage">$tlang.getFormattedMessage("presence.session.alert.message", $validator.escapeHtml($alertMessage))</div>#end
 	<div class="instruction">$tlang.getFormattedMessage("presence.session.total.value", $total)</div>
-	<table  class="listHier lines" summary ="$tlang.getString("presence.session.list.summary")" border="0" cellpadding="0" cellspacing="0"> 	
+	<table class="table table-hover table-striped table-bordered" summary="$tlang.getString("presence.session.list.summary")">
 		#foreach ($serverName in $serverList)
 			<tr class="exclude">
 				<th colspan="3"><h4>$tlang.getFormattedMessage("presence.session.on.server", $servers.get("$serverName").size(), $validator.escapeHtml($serverName))</h4></th>
@@ -29,16 +29,15 @@
 				</tr>
 				<tr>
 					<td>$tlang.getString("presence.session.agent")</td>
-					<td>$validator.escapeHtml($currSession.UserAgent)</td>															
+					<td>$validator.escapeHtml($currSession.UserAgent)</td>
 				</tr>
 				<tr>
 					<td>$tlang.getString("presence.session.started")</td>
-					<td>$validator.escapeHtml($currSession.getStart().toStringLocalFull())</td>															
+					<td>$validator.escapeHtml($currSession.getStart().toStringLocalFull())</td>
 				</tr>	
 			#end
 		#end
 	</table>
 </div>
-#sakai_courier() 
-
+#sakai_courier()
 
diff --git a/usermembership/tool/src/webapp/usermembership/sitelist.jsp b/usermembership/tool/src/webapp/usermembership/sitelist.jsp
@@ -64,7 +64,8 @@
 		<t:dataTable
 			value="#{SiteListBean.userSitesRows}"
 			var="row1"
-			styleClass="listHier narrowTable"
+			styleClass="table table-hover table-striped table-bordered"
+			columnClasses="visible,visible,visible,hidden-xs,hidden-xs,hidden-xs,hidden-xs,visible"
 			sortColumn="#{SiteListBean.sitesSortColumn}"
             sortAscending="#{SiteListBean.sitesSortAscending}"
             rendered="#{SiteListBean.renderTable}" >
@@ -87,38 +88,38 @@
 		        </f:facet>
 				<h:outputText value="#{row1.groups}"/>
 			</h:column>
-			<h:column id="siteType">
+			<t:column id="siteType" headerstyleClass="hidden-xs">
 				<f:facet name="header">
 		            <t:commandSortHeader columnName="siteType" immediate="true" arrow="true">
 		                <h:outputText value="#{msgs.site_type}"/>
 		            </t:commandSortHeader>
 		        </f:facet>
 				<h:outputText value="#{row1.siteType}"/>
-			</h:column>
-			<h:column id="siteTerm">
+			</t:column>
+			<t:column id="siteTerm" headerstyleClass="hidden-xs">
 				<f:facet name="header">
 		            <t:commandSortHeader columnName="siteTerm" immediate="true" arrow="true">
 		                <h:outputText value="#{msgs.site_term}"/>
 		            </t:commandSortHeader>
 		        </f:facet>
 				<h:outputText value="#{row1.siteTerm}"/>
-			</h:column>
-			<h:column id="roleID">
+			</t:column>
+			<t:column id="roleID" headerstyleClass="hidden-xs">
 				<f:facet name="header">
 		            <t:commandSortHeader columnName="roleId" immediate="true" arrow="true">
 		                <h:outputText value="#{msgs.role_name}"/>
 		            </t:commandSortHeader>
 		        </f:facet>
 				<h:outputText value="#{row1.roleName}"/>
-			</h:column>
-			<h:column id="pubView">
+			</t:column>
+			<t:column id="pubView" headerstyleClass="hidden-xs">
 				<f:facet name="header">
 		            <t:commandSortHeader columnName="published" immediate="true" arrow="true">
 		                <h:outputText value="#{msgs.status}"/>
 		            </t:commandSortHeader>
 		        </f:facet>
 				<h:outputText value="#{row1.pubView}"/>
-			</h:column>
+			</t:column>
 			<h:column id="userStatus">
 				<f:facet name="header">
 		            <t:commandSortHeader columnName="userStatus" immediate="true" arrow="true">

diff --git a/usermembership/tool/src/webapp/usermembership/userlist.jsp b/usermembership/tool/src/webapp/usermembership/userlist.jsp
@@ -79,37 +79,38 @@
 				firstItem="#{UserListBean.firstItem}"
 				pageSize="#{UserListBean.pageSize}"
 				accesskeys="true"
-				immediate="true"				
+				immediate="true"
 				rendered="#{UserListBean.renderPager}"
 				textItem="#{msgs.users}" />
 
 	 	<t:dataTable 
 			value="#{UserListBean.userRows}"
 			var="row"
-			styleClass="listHier narrowTable"
+			styleClass="table table-hover table-striped table-bordered"
+			columnClasses="visible,hidden-xs,visible,visible,visible,hidden-xs,hidden-xs,hidden-xs"
 			sortColumn="#{UserListBean.userSortColumn}" 
             sortAscending="#{UserListBean.userSortAscending}"
             first="#{UserListBean.firstItem}"
             rows="#{UserListBean.rowsNumber}"
             rendered="#{UserListBean.renderTable}">
-			<h:column id="userID">
+			<t:column id="userID">
 				<f:facet name="header">
 		            <t:commandSortHeader columnName="id" immediate="true" arrow="true">
-		                <h:outputText value="#{msgs.user_id}"/>		                
+		                <h:outputText value="#{msgs.user_id}"/>
 		            </t:commandSortHeader>
-		        </f:facet>		  
+		        </f:facet>
 		        <h:commandLink action="#{SiteListBean.processActionUserId}" value="#{row.userDisplayId}">
 					<f:param name="userId" value="#{row.userID}"/>
-				</h:commandLink>      
-			</h:column>
-			<h:column id="internalUserId">
+				</h:commandLink>
+			</t:column>
+			<t:column id="internalUserId" headerstyleClass="hidden-xs">
 				<f:facet name="header">
 		            <t:commandSortHeader columnName="internalUserId" immediate="true" arrow="true">
-		                <h:outputText value="#{msgs.internal_user_id}"/>		                
+		                <h:outputText value="#{msgs.internal_user_id}"/>
 		            </t:commandSortHeader>
-		        </f:facet>		  
+		        </f:facet>
 				<h:outputText value="#{row.userID}"/>
-			</h:column>
+			</t:column>
 			<h:column id="userName">
 				<f:facet name="header">
 		            <t:commandSortHeader columnName="name" immediate="true" arrow="true">
@@ -134,15 +135,15 @@
 		        </f:facet>
 				<h:outputText value="#{row.userType}"/>
 			</h:column>
-			<h:column id="authority">
+			<t:column id="authority" headerstyleClass="hidden-xs">
 				<f:facet name="header">
 		            <t:commandSortHeader columnName="authority" immediate="true" arrow="true">
 		                <h:outputText value="#{msgs.user_authority}"/>
 		            </t:commandSortHeader>
 		        </f:facet>
 				<h:outputText value="#{row.authority}"/>
-			</h:column>
-			<h:column id="createdOn">
+			</t:column>
+			<t:column id="createdOn" headerstyleClass="hidden-xs">
 				<f:facet name="header">
 		            <t:commandSortHeader columnName="createdOn" immediate="true" arrow="true">
 		                <h:outputText value="#{msgs.user_created_on}"/>
@@ -151,8 +152,8 @@
 				<h:outputText value="#{row.createdOn}">
 					<f:convertDateTime dateStyle="medium" timeZone="#{UserListBean.userTimeZone}"/>
 				</h:outputText>
-			</h:column>
-			<h:column id="modifiedOn">
+			</t:column>
+			<t:column id="modifiedOn" headerstyleClass="hidden-xs">
 				<f:facet name="header">
 		            <t:commandSortHeader columnName="modifiedOn" immediate="true" arrow="true">
 		                <h:outputText value="#{msgs.user_modified_on}"/>
@@ -161,12 +162,11 @@
 				<h:outputText value="#{row.modifiedOn}">
 					<f:convertDateTime dateStyle="medium" timeZone="#{UserListBean.userTimeZone}"/>
 				</h:outputText>
-			</h:column>
+			</t:column>
 		</t:dataTable>
 
-		<p class="instruction" style="margin-top: 40px;">
-			<h:outputText value="#{msgs.no_enrollments}" rendered="#{UserListBean.emptyUserList}" />
-		</p>		
+		<h:outputText value="#{msgs.no_enrollments}" rendered="#{UserListBean.emptyUserList}" styleClass="instruction" />
+
 		<t:div styleClass="act" rendered="#{!UserListBean.emptyUserList && UserListBean.renderTable}">
 			<h:commandButton id="exportCsv" actionListener="#{UserListBean.exportAsCsv}" value="#{msgs.export_csv_button}"/>
 			<h:commandButton id="exportXls" actionListener="#{UserListBean.exportAsXls}" value="#{msgs.export_excel_button}"/>