Improved the look of the file room view, also made alternated table style work

diff --git a/webcit/static/t/files.html b/webcit/static/t/files.html
index c499776d3a27ae690c9ba2a1f542eac369439e26..99ea5f5be4c2da8effd93e5188760d4193079691 100644 (file)
--- a/webcit/static/t/files.html
+++ b/webcit/static/t/files.html
@@ -1,6 +1,21 @@
 <?=("head")>
 <?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
-<div id="banner"><h1><?_("Files available for download in")> <?ROOMNAME></h1></div>
+<div id="banner">
+       <h1><?_("Files available for download in")>&nbsp;<?ROOMNAME></h1>
+       <?!("COND:THISROOM:FLAG:QR", 2, #"QR_UPLOAD")>
+               <br>
+               <form enctype="multipart/form-data" method="POST" accept-charset="UTF-8" action="upload_file" name="upload_file_form">
+                       <input type="hidden" name="nonce" value="<?NONCE>">
+                       <?_("Upload a file:")>&nbsp;
+                       <div id="navbar">
+                               <input name="filename" size="1" type="file">&nbsp;
+                               <?_("Description:")>&nbsp;
+                               <input type="text" name="description" maxlength="50" size="50">&nbsp;
+                               <input type="submit" name="attach_button" value="<?_("Upload")>">
+                       </div>
+               </form>
+       <??("X", 2)>
+</div>
 
 <script language="javascript" type="text/javascript">
   document.onkeydown = CtdlMsgListKeyPress;
@@ -10,38 +25,13 @@
 </script>
 
 <div id="content" class="service">
-
-<table class="downloads_background">
-<tr>
-  <th><?_("Filename")>&nbsp;<a href="do_template?template=files?SortOrder=<?SORT:ORDER("filename")>&SortBy=<?SORT:NEXT("filename")>"><img border="0" src="<?SORT:ICON("filename")>" /></a> </th>
-  <th><?_("Size")>&nbsp;<a href="do_template?template=files?SortOrder=<?SORT:ORDER("filesize")>&SortBy=<?SORT:NEXT("filesize")>"><img border="0" src="<?SORT:ICON("filesize")>" /></a> </th>
-  <th><?_("Content")>&nbsp;<a href="do_template?template=files?SortOrder=<?SORT:ORDER("filemime")>&SortBy=<?SORT:NEXT("filemime")>"><img border="0" src="<?SORT:ICON("filemime")>" /></a> </th>
-  <th><?_("Description")>&nbsp;<a href="do_template?template=files?SortOrder=<?SORT:ORDER("filesubject")>&SortBy=<?SORT:NEXT("filesubject")>"><img border="0" src="<?SORT:ICON("filesubject")>" /></a> </th>
-</tr>
-<?ITERATE("ROOM:FILES", ="files_section_onefile")>
-
-
-
-
-
-
-
-<?!("COND:THISROOM:FLAG:QR", 2, #"QR_UPLOAD")>
-<hr>
-<form enctype="multipart/form-data" method="POST" accept-charset="UTF-8" action="upload_file" name="upload_file_form">
-<input type="hidden" name="nonce" value="<?NONCE>">
-<?_("Upload a file:")>
-&nbsp;
-<input NAME="filename" SIZE=16 TYPE="file">&nbsp;
-<?_("Description:")>&nbsp;
-<input type="text" name="description" maxlength="64" size="64">&nbsp;
-<input type="submit" name="attach_button" value="<?_("Upload")>">
-</form>
-</div>
-<??("X", 2)>
-
-
-</div>
-
-
+       <table class="downloads_background altern">
+       <tr>
+         <th><?_("Filename")>&nbsp;<a href="do_template?template=files?SortOrder=<?SORT:ORDER("filename")>&SortBy=<?SORT:NEXT("filename")>"><img border="0" src="<?SORT:ICON("filename")>" /></a> </th>
+         <th><?_("Size")>&nbsp;<a href="do_template?template=files?SortOrder=<?SORT:ORDER("filesize")>&SortBy=<?SORT:NEXT("filesize")>"><img border="0" src="<?SORT:ICON("filesize")>" /></a> </th>
+         <th><?_("Content")>&nbsp;<a href="do_template?template=files?SortOrder=<?SORT:ORDER("filemime")>&SortBy=<?SORT:NEXT("filemime")>"><img border="0" src="<?SORT:ICON("filemime")>" /></a> </th>
+         <th><?_("Description")>&nbsp;<a href="do_template?template=files?SortOrder=<?SORT:ORDER("filesubject")>&SortBy=<?SORT:NEXT("filesubject")>"><img border="0" src="<?SORT:ICON("filesubject")>" /></a> </th>
+       </tr>
+       <?ITERATE("ROOM:FILES", ="files_section_onefile")>
+       </div>
 <?=("trailing")>

diff --git a/webcit/static/t/files/section_onefile.html b/webcit/static/t/files/section_onefile.html
index 32ecdf0c6c31b439e51239daf7520d964803dd35..6d6d04f530def9f9849c93cf6d832cb3f8c1fc7d 100644 (file)
--- a/webcit/static/t/files/section_onefile.html
+++ b/webcit/static/t/files/section_onefile.html
@@ -3,20 +3,20 @@
 <?!("X", 2)><?!("X", 1)>
 
 <tr class="<?ITERATE:ODDEVEN>">
-<td>
- <a href="download_file/<?FILE:NAME("U")>">
-  <img src="display_mime_icon?type=<?FILE:MIMETYPE>" border="0" align="middle" alt="">
-  <?FILE:NAME></a>
-</td>
-<td><?FILE:SIZE></td>
-<td><?FILE:MIMETYPE></td>
-<td><?FILE:COMMENT("X")></td>
-<??("COND:AIDE", 4)><td><a href="delete_file?file=<?FILE:NAME("U")>"><img src="static/webcit_icons/essen/16x16/delete.png" alt="<?_("Delete File")>"></a></td><??("X", 4)>
+       <td>
+        <a href="download_file/<?FILE:NAME("U")>">
+         <img src="display_mime_icon?type=<?FILE:MIMETYPE>" border="0" align="middle" alt="">
+         <?FILE:NAME></a>
+       </td>
+       <td><?FILE:SIZE></td>
+       <td><?FILE:MIMETYPE></td>
+       <td><?FILE:COMMENT("X")></td>
+       <??("COND:AIDE", 4)><td><a href="delete_file?file=<?FILE:NAME("U")>"><img src="static/webcit_icons/essen/16x16/delete.png" alt="<?_("Delete File")>"></a></td><??("X", 4)>
 </tr>
 
 <?!("COND:ITERATE:LASTN", 2)>
-</table>
-<?!("COND:FILE:ISPIC", 3)>
-<div class="buttons"><a href="do_template?template=files_jspicview&frame=1"><?_("Slideshow")></a></div>
-<??("X", 3)>
+       </table>
+       <?!("COND:FILE:ISPIC", 3)>
+               <div class="buttons"><?=("files_section_onefile_picview")><?_("Slideshow")></a></div>
+       <??("X", 3)>
 <?!("X", 2)>