Browse Source

HUE-101. Incorporate new HtmlTable and be explicit about which tables are selectable.

Aaron Newton 15 years ago
parent
commit
5556fbe883

+ 1 - 1
apps/beeswax/src/beeswax/templates/show_tables.mako

@@ -27,7 +27,7 @@ ${wrappers.head("Beeswax: Table List", section='tables')}
 <div id="show_tables" class="view">
 <div id="show_tables" class="view">
   <h2 class="ccs-hidden">Tables</h2>
   <h2 class="ccs-hidden">Tables</h2>
 
 
-  <table data-filters="HtmlTable" class="sortable" cellpadding="0" cellspacing="0">
+  <table data-filters="HtmlTable" class="selectable sortable" cellpadding="0" cellspacing="0">
     <thead>
     <thead>
       <tr>
       <tr>
         <th>Table Name</th>
         <th>Table Name</th>

+ 1 - 1
apps/jframegallery/src/jframegallery/templates/fit.text.(table).mako

@@ -22,7 +22,7 @@
 	<body>
 	<body>
 	<h1 class="ccs-hidden">FitText (table)</h1>
 	<h1 class="ccs-hidden">FitText (table)</h1>
 	
 	
-	<table data-filters="" class="noSelect" cellpadding="0" cellspacing="0">
+	<table cellpadding="0" cellspacing="0">
 		<thead>
 		<thead>
 			<tr>
 			<tr>
 				<th>
 				<th>

+ 1 - 1
apps/jobbrowser/src/jobbrowser/templates/job.mako

@@ -22,7 +22,7 @@
 %>
 %>
 
 
 <%def name="task_table(tasks)">
 <%def name="task_table(tasks)">
-  <table data-filters="HtmlTable" class="sortable" cellpadding="0" cellspacing="0">
+  <table data-filters="HtmlTable" class="selectable sortable" cellpadding="0" cellspacing="0">
     <thead>
     <thead>
       <tr>
       <tr>
         <th>Tasks</th>
         <th>Tasks</th>

+ 1 - 1
apps/jobbrowser/src/jobbrowser/templates/jobs.mako

@@ -54,7 +54,7 @@
         </div>
         </div>
     
     
     
     
-        <table data-filters="HtmlTable" class="sortable" cellpadding="0" cellspacing="0">
+        <table data-filters="HtmlTable" class="selectable sortable" cellpadding="0" cellspacing="0">
           <thead>
           <thead>
             <tr>
             <tr>
               <th>Name / Id</th>
               <th>Name / Id</th>

+ 1 - 1
apps/jobbrowser/src/jobbrowser/templates/task.mako

@@ -40,7 +40,7 @@
 
 
         <ul class="tab_sections ccs-clear">
         <ul class="tab_sections ccs-clear">
           <li>
           <li>
-            <table border="0" cellpadding="0" cellspacing="0" data-filters="HtmlTable" class="jt_meta_table sortable">
+            <table border="0" cellpadding="0" cellspacing="0" data-filters="HtmlTable" class="jt_meta_table sortable selectable">
               <thead>
               <thead>
                 <tr>
                 <tr>
                  <th>Attempt ID</th>
                  <th>Attempt ID</th>

+ 1 - 1
apps/jobbrowser/src/jobbrowser/templates/tasks.mako

@@ -90,7 +90,7 @@
         </form>
         </form>
       </ul>
       </ul>
     </div>
     </div>
-    <table data-filters="HtmlTable" cellpadding="0" cellspacing="0">
+    <table data-filters="HtmlTable" class="selectable" cellpadding="0" cellspacing="0">
       <thead>
       <thead>
          <tr>
          <tr>
            <th>Task ID</th>
            <th>Task ID</th>

+ 31 - 31
apps/jobsub/src/jobsub/templates/watch.html

@@ -18,37 +18,37 @@ limitations under the License.
 {% endcomment %}
 {% endcomment %}
 {% block title %}Job History{% endblock %}
 {% block title %}Job History{% endblock %}
 {% block head %}
 {% block head %}
-	<meta http-equiv="refresh" content="5" />
+  <meta http-equiv="refresh" content="5" />
 {% endblock %}
 {% endblock %}
 {% block content %}
 {% block content %}
-	<div id="jobsub_history" class="view">
-		<h1>Recently Launched Jobs</h1>
-		<table data-filters="HtmlTable" class="sortable">
-			<thead>
-				<tr>
-					<th>Owner</th>
-					<th>Name</th>
-					<th>Submitted</th>
-					<th colspan=2>Last known state</th>
-				</tr>
-			</thead>
-			<tbody>
-				{% for submission in submissions %}
-					<tr>
-						<td>{{ submission.owner }}</td>
-						<td>{{ submission.name }}</td>
-						<td>
-							<span class="jobsub_actual_date" style="display: none">{{ submission.submission_date|date:"U" }}</span>
-							{{ submission.submission_date|timesince }} ago
-						</td>
-                                                <td>{{ submission.last_seen_state_as_string }}</td>
-						<td><a href="{{ submission.watch_url }}" class="jobsub_watch">watch progress</a></td>
-					</tr>
-				{% endfor %}
-			</tbody>
-		</table>
-		{% if more %}
-			<a href="/jobsub/watch/?offset={{ offset }}&limit={{ limit|add:"20" }}" class="jobsub_more">See more</a>
-		{% endif %}
-	</div>
+  <div id="jobsub_history" class="view">
+    <h1>Recently Launched Jobs</h1>
+    <table data-filters="HtmlTable" class="sortable">
+      <thead>
+        <tr>
+          <th>Owner</th>
+          <th>Name</th>
+          <th>Submitted</th>
+          <th colspan=2>Last known state</th>
+        </tr>
+      </thead>
+      <tbody>
+        {% for submission in submissions %}
+          <tr>
+            <td>{{ submission.owner }}</td>
+            <td>{{ submission.name }}</td>
+            <td>
+              <span class="jobsub_actual_date" style="display: none">{{ submission.submission_date|date:"U" }}</span>
+              {{ submission.submission_date|timesince }} ago
+            </td>
+            <td>{{ submission.last_seen_state_as_string }}</td>
+            <td><a href="{{ submission.watch_url }}" class="jobsub_watch">watch progress</a></td>
+          </tr>
+        {% endfor %}
+      </tbody>
+    </table>
+    {% if more %}
+      <a href="/jobsub/watch/?offset={{ offset }}&limit={{ limit|add:"20" }}" class="jobsub_more">See more</a>
+    {% endif %}
+  </div>
 {% endblock %}
 {% endblock %}

+ 1 - 2
apps/jobsub/static/js/Source/JobSub/CCS.JobSub.js

@@ -17,8 +17,7 @@
 ---
 ---
 description: Job Designer (nee "JobSub")
 description: Job Designer (nee "JobSub")
 provides: [CCS.JobSub]
 provides: [CCS.JobSub]
-requires: [ccs-shared/CCS.JBrowser, More/HtmlTable.Sort, Widgets/ART.SplitView,
-  clientcide/Collapsible, clientcide/StickyWin.Confirm]
+requires: [ccs-shared/CCS.JBrowser]
 script: CCS.JobSub.js
 script: CCS.JobSub.js
 
 
 ...
 ...

+ 1 - 4
desktop/core/static/css/shared.css

@@ -235,14 +235,11 @@ table[data-filters*=HtmlTable] tr.table-tr-odd td {
 table[data-filters*=HtmlTable] tr:nth-child(odd) td {
 table[data-filters*=HtmlTable] tr:nth-child(odd) td {
 	background: #f3f3f3;
 	background: #f3f3f3;
 }
 }
-table[data-filters*=HtmlTable] tr:hover > td, table[data-filters*=HtmlTable] tr.table-tr-hovered td {
+table[data-filters*=HtmlTable].selectable tr:hover > td, table[data-filters*=HtmlTable].selectable tr.table-tr-hovered td {
 	background-color: #d4e7f8;
 	background-color: #d4e7f8;
 	color: #000;
 	color: #000;
 	cursor: pointer;
 	cursor: pointer;
 }
 }
-table[data-filters*=HtmlTable].noSelect tr:hover > td, table[data-filters*=HtmlTable].noSelect tr.table-tr-hovered td {
-	cursor: auto;
-}
 table[data-filters*=HtmlTable] tr.selected td, table[data-filters*=HtmlTable] tr.table-tr-selected td, table[data-filters*=HtmlTable] tr.selected td a, table[data-filters*=HtmlTable] tr.table-tr-selected td a {
 table[data-filters*=HtmlTable] tr.selected td, table[data-filters*=HtmlTable] tr.table-tr-selected td, table[data-filters*=HtmlTable] tr.selected td a, table[data-filters*=HtmlTable] tr.table-tr-selected td a {
 	background-color: #3875d7;
 	background-color: #3875d7;
 	color: #fff;
 	color: #fff;

+ 2 - 2
desktop/core/static/js/Source/UI/ART.SideBySideSelect.js

@@ -35,14 +35,14 @@ ART.SideBySideSelect = new Class({
 		deselectedOptions: {
 		deselectedOptions: {
 			properties: {
 			properties: {
 				'data-filters': 'HtmlTable',
 				'data-filters': 'HtmlTable',
-				'class':'noKeyboard noSelect'
+				'class':'noKeyboard'
 			},
 			},
 			headers: ['Deselected']
 			headers: ['Deselected']
 		},
 		},
 		selectedOptions: {
 		selectedOptions: {
 			properties: {
 			properties: {
 				'data-filters': 'HtmlTable',
 				'data-filters': 'HtmlTable',
-				'class':'noKeyboard noSelect'
+				'class':'noKeyboard'
 			},
 			},
 			headers: ['Selected']
 			headers: ['Selected']
 		},
 		},

+ 1 - 1
ext/thirdparty/js/art-widgets.hash

@@ -1 +1 @@
-ba6e0bd42d828715e3684c69c54e37a65fef6b3
+ae61e01568479e76bae31e0d0874ffe4fe792f48