From: <sy...@us...> - 2008-08-26 19:27:09
|
Revision: 14524 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=14524&view=rev Author: sylvieg Date: 2008-08-26 19:27:18 +0000 (Tue, 26 Aug 2008) Log Message: ----------- [FIX]fgal: try to fix the layout 1) not to have the label disconnected fromt the input 2)take a maximum of style in the tpl 3) semantic wioth use of label --> can we rollback to a table, it looks better Modified Paths: -------------- trunk/styles/darkroom.css trunk/styles/tikinewt.css trunk/styles/transitions/2.0to3.0.css trunk/templates/tiki-upload_file.tpl Modified: trunk/styles/darkroom.css =================================================================== --- trunk/styles/darkroom.css 2008-08-26 18:42:37 UTC (rev 14523) +++ trunk/styles/darkroom.css 2008-08-26 19:27:18 UTC (rev 14524) @@ -167,7 +167,7 @@ * html .findtable input {font-size: 1em} * html .wikitopline select {font-size: .9em} small {font-size: 0.8em} -label {} +label {display:block;} ul, ol {text-align: left} li {} @@ -2413,5 +2413,5 @@ a.admbox.off:hover, a.admbox.off:focus, a.admbox.off:active {border: 1px solid #9f9f9f} - +#page_bar {text-align:center;} /* end of css file */ \ No newline at end of file Modified: trunk/styles/tikinewt.css =================================================================== --- trunk/styles/tikinewt.css 2008-08-26 18:42:37 UTC (rev 14523) +++ trunk/styles/tikinewt.css 2008-08-26 19:27:18 UTC (rev 14524) @@ -161,6 +161,7 @@ label { cursor: pointer; + display: block; } /***** Basic Page Layout @@ -2819,5 +2820,7 @@ .sub { padding-left: 5em !important; } - +#page_bar { + text-align: center; +} /***** End of file ******/ Modified: trunk/styles/transitions/2.0to3.0.css =================================================================== --- trunk/styles/transitions/2.0to3.0.css 2008-08-26 18:42:37 UTC (rev 14523) +++ trunk/styles/transitions/2.0to3.0.css 2008-08-26 19:27:18 UTC (rev 14524) @@ -41,3 +41,5 @@ h3.box-title span.moduleflip { float: right; } +label {display:block;} + Modified: trunk/templates/tiki-upload_file.tpl =================================================================== --- trunk/templates/tiki-upload_file.tpl 2008-08-26 18:42:37 UTC (rev 14523) +++ trunk/templates/tiki-upload_file.tpl 2008-08-26 19:27:18 UTC (rev 14524) @@ -92,87 +92,91 @@ {/remarksbox} {/if} - <div align="center"> + <div> {capture name=upload_file assign=upload_str} <hr class="clear"/> <div class="clear"> - <div class="floatleft clearfix" style="padding-right: 10px;"> - <table> - <tr> - <td>{tr}File Title:{/tr}</td> - <td><input type="text" name="name[]" {if $fileInfo.name}value="{$fileInfo.name}"{/if} size="40" /> {if $gal_info.type eq "podcast" or $gal_info.type eq "vidcast"} ({tr}required field for podcasts{/tr}){/if}</td> - </tr> - <tr> + <div class="floatleft"> + <label> + {tr}File Title:{/tr} + <input type="text" name="name[]" {if $fileInfo.name}value="{$fileInfo.name}"{/if} size="40" /> {if $gal_info.type eq "podcast" or $gal_info.type eq "vidcast"} ({tr}required field for podcasts{/tr}){/if}</td> + </label> + <label> <td>{tr}File Description:{/tr}</td> <td><textarea rows="2" cols="40" name="description[]">{if $fileInfo.description}{$fileInfo.description}{/if}</textarea> {if $gal_info.type eq "podcast" or $gal_info.type eq "vidcast"} ({tr}required field for podcasts{/tr}){/if} </td> - </tr> + </label> {* File replacement is only here when the javascript upload action is not available in the file listing. This may be moved later in another specific place (e.g. simple popup) for non-javascript browsers since it is not really a "Property" of the file *} {if $prefs.javascript_enabled neq 'y' || ! $editFileId} - <tr> - <td>{tr}Upload from disk:{/tr} + <label> + {tr}Upload from disk:{/tr} {if $editFileId}{$fileInfo.filename|escape}<br />{/if}</td> - <td><input name="userfile[]" type="file" size="30"/></td> - </tr> + <input name="userfile[]" type="file" size="30"/> + </label> {/if} - </table> </div> - <div class="clearfix" style="text-align: left;"> + <div class="floatleft"> {if $editFileId} <input type="hidden" name="galleryId" value="{$galleryId}"/> <input type="hidden" name="fileId" value="{$editFileId}"/> <input type="hidden" name="lockedby" value="{$fileInfo.lockedby|escape}" \> {else} - {tr}File Gallery:{/tr} - <select name="galleryId[]" style="width:150px"> - {section name=idx loop=$galleries} - {if ($galleries[idx].individual eq 'n') or ($galleries[idx].individual_tiki_p_upload_files eq 'y')} - <option value="{$galleries[idx].id|escape}" {if $galleries[idx].id eq $galleryId}selected="selected"{/if}>{$galleries[idx].name}</option> - {/if} - {/section} - </select> - <br/> + <label> + {tr}File Gallery:{/tr} + <select name="galleryId[]" style="width:150px"> + {section name=idx loop=$galleries} + {if ($galleries[idx].individual eq 'n') or ($galleries[idx].individual_tiki_p_upload_files eq 'y')} + <option value="{$galleries[idx].id|escape}" {if $galleries[idx].id eq $galleryId}selected="selected"{/if}>{$galleries[idx].name}</option> + {/if} + {/section} + </select> + </label> {/if} {if !$editFileId and $tiki_p_batch_upload_files eq 'y'} - {tr}Unzip all zip files:{/tr} - <input type="checkbox" name="isbatch[]" /> - <br/> + <label> + {tr}Unzip all zip files:{/tr} + <input type="checkbox" name="isbatch[]" /> + </label> {/if} {if $tiki_p_admin_file_galleries eq 'y'} - {tr}Creator:{/tr} - <select name="user[]"> - {section name=ix loop=$users} - <option value="{$users[ix].login|escape}"{if (isset($fileInfo) and $fileInfo.user eq $users[ix].login) or (!isset($fileInfo) and $user == $users[ix].login)} selected="selected"{/if}>{$users[ix].login|username}</option> - {/section} - </select> - <br/> + <label> + {tr}Creator:{/tr} + <select name="user[]"> + {section name=ix loop=$users} + <option value="{$users[ix].login|escape}"{if (isset($fileInfo) and $fileInfo.user eq $users[ix].login) or (!isset($fileInfo) and $user == $users[ix].login)} selected="selected"{/if}>{$users[ix].login|username}</option> + {/section} + </select> + </label> {/if} {if $prefs.fgal_limit_hits_per_file eq 'y'} - {tr}Maximum amount of downloads:{/tr} - <input type="text" name="hit_limit[]" value="{$hit_limit|default:0}"/> - {tr}0 for no limit{/tr} - <br/> + <label> + {tr}Maximum amount of downloads:{/tr} + <input type="text" name="hit_limit[]" value="{$hit_limit|default:0}"/> + {tr}0 for no limit{/tr} + </label> {/if} {if $prefs.feature_file_galleries_author eq 'y'} - {tr}Author if not the file creator:{/tr} - <input type="text" name="author[]" value="{$fileInfo.author|escape}" /> - <br/> + <label> + {tr}Author if not the file creator:{/tr} + <input type="text" name="author[]" value="{$fileInfo.author|escape}" /> + </label> {/if} {* We want comments only on updated files *} {if $prefs.javascript_enabled neq 'y' && $editFileId} - {tr}Comment:{/tr} - <input type="text" name="comment[]" value="" size="40" /> - <br/> + <label> + {tr}Comment:{/tr} + <input type="text" name="comment[]" value="" size="40" /> + </label> {/if} </div> </div> @@ -194,6 +198,7 @@ <div id="multi_1"> </div> <hr class="clear"/> + <div id="page_bar"> {if $prefs.javascript_enabled eq 'y'} <input class="submitbutton" type="button" onclick="upload('0', 'loader_0')" value="{if $editFileId}{tr}Save{/tr}{else}{tr}Upload{/tr}{/if}"/> {if !$editFileId} @@ -201,6 +206,7 @@ {/if} {/if} </div> + </div> {if !empty($fileInfo.lockedby) and $user ne $fileInfo.lockedby} {icon _id="lock" class="" alt=""} <span class="attention">{tr}The file is locked by {$fileInfo.lockedby}{/tr}</span> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |