diff options
| author | nikrou <nikrou@piwigo.org> | 2009-03-09 19:41:45 +0000 |
|---|---|---|
| committer | nikrou <nikrou@piwigo.org> | 2009-03-09 19:41:45 +0000 |
| commit | bea3462f56e589ac95619c865cb4d89efe554d13 (patch) | |
| tree | 048b6e1e0737604053f6982ebae253c9ce7fc332 | |
| parent | 10e179f482cdba4ba8bfbe98a51b160435d399c1 (diff) | |
fix html warnings. unclosed monotags
git-svn-id: http://piwigo.org/svn/trunk@3185 68402e56-0260-453c-a942-63ccdbb3a9ee
93 files changed, 479 insertions, 479 deletions
diff --git a/admin/cat_modify.php b/admin/cat_modify.php index 99735fba3..1c740305c 100644 --- a/admin/cat_modify.php +++ b/admin/cat_modify.php @@ -471,7 +471,7 @@ SELECT id, file, path, tn_ext 'image_file' => $element['file'], 'category' => $category )) - .'" class="thumblnk"><img src="'.get_thumbnail_url($element).'"/></a>'; + .'" class="thumblnk"><img src="'.get_thumbnail_url($element).'"></a>'; } } diff --git a/admin/include/c13y_internal.class.php b/admin/include/c13y_internal.class.php index 093b67b6d..8065cbbb2 100644 --- a/admin/include/c13y_internal.class.php +++ b/admin/include/c13y_internal.class.php @@ -54,7 +54,7 @@ class c13y_internal null, null, l10n('c13y_version_correction') - .'<BR />'. + .'<br>'. $c13y->get_htlm_links_more_info()); } } @@ -79,7 +79,7 @@ class c13y_internal null, null, sprintf(l10n('c13y_exif_correction'), '$conf[\''.$value.'\']') - .'<BR />'. + .'<br>'. $c13y->get_htlm_links_more_info()); } } diff --git a/admin/template/goto/cat_list.tpl b/admin/template/goto/cat_list.tpl index e3abaacc2..d21eac5aa 100644 --- a/admin/template/goto/cat_list.tpl +++ b/admin/template/goto/cat_list.tpl @@ -28,11 +28,11 @@ <form id="addVirtual" action="{$F_ACTION}" method="post"> <p> - {'cat_add'|@translate} : <input type="text" name="virtual_name" /> - <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitAdd" {$TAG_INPUT_ENABLED} /> + {'cat_add'|@translate} : <input type="text" name="virtual_name"> + <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitAdd" {$TAG_INPUT_ENABLED}> {if count($categories)>9 } <a href="#EoP" class="button" style="border:0;"> - <img src="{$themeconf.admin_icon_dir}/page_end.png" title="{'Page end'|@translate}" class="button" alt="page_end" style="margin-bottom:-0.6em;"/></a> + <img src="{$themeconf.admin_icon_dir}/page_end.png" title="{'Page end'|@translate}" class="button" alt="page_end" style="margin-bottom:-0.6em;"></a> {/if} </p> </form> @@ -40,8 +40,8 @@ {if count($categories) } <form id="categoryOrdering" action="{$F_ACTION}" method="post"> <p> - <input class="submit" name="submitOrder" type="submit" value="{'Save order'|@translate}" {$TAG_INPUT_ENABLED} /> - <input class="submit" name="submitOrderAlphaNum" type="submit" value="{'Order alphanumerically'|@translate}" {$TAG_INPUT_ENABLED} /> + <input class="submit" name="submitOrder" type="submit" value="{'Save order'|@translate}" {$TAG_INPUT_ENABLED}> + <input class="submit" name="submitOrderAlphaNum" type="submit" value="{'Order alphanumerically'|@translate}" {$TAG_INPUT_ENABLED}> </p> <ul class="categoryUl"> @@ -50,33 +50,33 @@ <!-- category {$category.ID} --> <ul class="categoryActions"> {if cat_admin_access($category.ID)} - <li><a href="{$category.U_JUMPTO}" title="{'jump to category'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_jump-to.png" class="button" alt="{'jump to category'|@translate}" /></a></li> + <li><a href="{$category.U_JUMPTO}" title="{'jump to category'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_jump-to.png" class="button" alt="{'jump to category'|@translate}"></a></li> {/if} - <li><a href="{$category.U_EDIT}" title="{'edit category informations'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_edit.png" class="button" alt="{'edit'|@translate}"/></a></li> + <li><a href="{$category.U_EDIT}" title="{'edit category informations'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_edit.png" class="button" alt="{'edit'|@translate}"></a></li> {if isset($category.U_MANAGE_ELEMENTS) } - <li><a href="{$category.U_MANAGE_ELEMENTS}" title="{'manage category elements'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_elements.png" class="button" alt="{'elements'|@translate}" /></a></li> + <li><a href="{$category.U_MANAGE_ELEMENTS}" title="{'manage category elements'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_elements.png" class="button" alt="{'elements'|@translate}"></a></li> {/if} - <li><a href="{$category.U_CHILDREN}" title="{'manage sub-categories'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_children.png" class="button" alt="{'sub-categories'|@translate}" /></a></li> + <li><a href="{$category.U_CHILDREN}" title="{'manage sub-categories'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_children.png" class="button" alt="{'sub-categories'|@translate}"></a></li> {if isset($category.U_MANAGE_PERMISSIONS) } - <li><a href="{$category.U_MANAGE_PERMISSIONS}" title="{'edit category permissions'|@translate}" ><img src="{$themeconf.admin_icon_dir}/category_permissions.png" class="button" alt="{'permissions'|@translate}" /></a></li> + <li><a href="{$category.U_MANAGE_PERMISSIONS}" title="{'edit category permissions'|@translate}" ><img src="{$themeconf.admin_icon_dir}/category_permissions.png" class="button" alt="{'permissions'|@translate}"></a></li> {/if} {if isset($category.U_DELETE) } - <li><a href="{$category.U_DELETE}" title="{'delete category'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');"><img src="{$themeconf.admin_icon_dir}/category_delete.png" class="button" alt="{'delete'|@translate}" /></a></li> + <li><a href="{$category.U_DELETE}" title="{'delete category'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');"><img src="{$themeconf.admin_icon_dir}/category_delete.png" class="button" alt="{'delete'|@translate}"></a></li> {/if} </ul> <p> - <img src="{$themeconf.admin_icon_dir}/cat_move.png" class="button drag_button" style="display:none;" alt="{'Drag to re-order'|@translate}" title="{'Drag to re-order'|@translate}"/> + <img src="{$themeconf.admin_icon_dir}/cat_move.png" class="button drag_button" style="display:none;" alt="{'Drag to re-order'|@translate}" title="{'Drag to re-order'|@translate}"> <strong><a href="{$category.U_CHILDREN}" title="{'manage sub-categories'|@translate}">{$category.NAME}</a></strong> {if $category.IS_VIRTUAL} - <img src="{$themeconf.admin_icon_dir}/virt_category.png" class="button" alt="{'virtual_category'|@translate}" /> + <img src="{$themeconf.admin_icon_dir}/virt_category.png" class="button" alt="{'virtual_category'|@translate}"> {/if} </p> <p class="catPos"> <label> {'Position'|@translate} : - <input type="text" size="4" name="catOrd[{$category.ID}]" maxlength="4" value="{$category.RANK}" /> + <input type="text" size="4" name="catOrd[{$category.ID}]" maxlength="4" value="{$category.RANK}"> </label> </p> @@ -84,8 +84,8 @@ {/foreach} </ul> <p> - <input class="submit" name="submitOrder" type="submit" value="{'Save order'|@translate}" {$TAG_INPUT_ENABLED} /> - <input class="submit" name="submitOrderAlphaNum" type="submit" value="{'Order alphanumerically'|@translate}" {$TAG_INPUT_ENABLED} /> + <input class="submit" name="submitOrder" type="submit" value="{'Save order'|@translate}" {$TAG_INPUT_ENABLED}> + <input class="submit" name="submitOrderAlphaNum" type="submit" value="{'Order alphanumerically'|@translate}" {$TAG_INPUT_ENABLED}> </p> </form> diff --git a/admin/template/goto/cat_modify.tpl b/admin/template/goto/cat_modify.tpl index 418f87539..01d4e4c71 100644 --- a/admin/template/goto/cat_modify.tpl +++ b/admin/template/goto/cat_modify.tpl @@ -11,18 +11,18 @@ <ul class="categoryActions"> {if cat_admin_access($CAT_ID)} - <li><a href="{$U_JUMPTO}" title="{'jump to category'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_jump-to.png" class="button" alt="{'jump to category'|@translate}" /></a></li> + <li><a href="{$U_JUMPTO}" title="{'jump to category'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_jump-to.png" class="button" alt="{'jump to category'|@translate}"></a></li> {/if} {if isset($U_MANAGE_ELEMENTS) } - <li><a href="{$U_MANAGE_ELEMENTS}" title="{'manage category elements'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_elements.png" class="button" alt="{'elements'|@translate}" /></a></li> - <li><a href="{$U_MANAGE_RANKS}" title="{'manage image ranks'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/ranks.png" class="button" alt="{'ranks'|@translate}" /></a></li> + <li><a href="{$U_MANAGE_ELEMENTS}" title="{'manage category elements'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_elements.png" class="button" alt="{'elements'|@translate}"></a></li> + <li><a href="{$U_MANAGE_RANKS}" title="{'manage image ranks'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/ranks.png" class="button" alt="{'ranks'|@translate}"></a></li> {/if} - <li><a href="{$U_CHILDREN}" title="{'manage sub-categories'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_children.png" class="button" alt="{'sub-categories'|@translate}" /></a></li> + <li><a href="{$U_CHILDREN}" title="{'manage sub-categories'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_children.png" class="button" alt="{'sub-categories'|@translate}"></a></li> {if isset($U_MANAGE_PERMISSIONS) } - <li><a href="{$U_MANAGE_PERMISSIONS}" title="{'edit category permissions'|@translate}" ><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_permissions.png" class="button" alt="{'permissions'|@translate}" /></a></li> + <li><a href="{$U_MANAGE_PERMISSIONS}" title="{'edit category permissions'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_permissions.png" class="button" alt="{'permissions'|@translate}"></a></li> {/if} {if isset($U_DELETE) } - <li><a href="{$U_DELETE}" title="{'delete category'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:'javascript'}');"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_delete.png" class="button" alt="{'delete'|@translate}" /></a></li> + <li><a href="{$U_DELETE}" title="{'delete category'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:'javascript'}');"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_delete.png" class="button" alt="{'delete'|@translate}"></a></li> {/if} </ul> @@ -42,7 +42,7 @@ <tr> <td><strong>{'Name'|@translate}</strong></td> <td> - <input type="text" class="large" name="name" value="{$CAT_NAME}" maxlength="60"/> + <input type="text" class="large" name="name" value="{$CAT_NAME}" maxlength="60"> </td> </tr> <tr> @@ -99,12 +99,12 @@ <fieldset id="image_order"> <legend>{'Sort order'|@translate}</legend> - <input type="checkbox" name="image_order_default" id="image_order_default" {$IMG_ORDER_DEFAULT} /> + <input type="checkbox" name="image_order_default" id="image_order_default" {$IMG_ORDER_DEFAULT}> <label for="image_order_default">{'Use default sort order'|@translate}</label> - <br/> - <input type="checkbox" name="image_order_subcats" id="image_order_subcats" /> + <br> + <input type="checkbox" name="image_order_subcats" id="image_order_subcats"> <label for="image_order_subcats">{'Apply to subcategories'|@translate}</label> - <br/> + <br> {foreach from=$image_orders item=order} <select name="order_field_{$order.ID}"> @@ -112,14 +112,14 @@ </select> <select name="order_direction_{$order.ID}"> {html_options options=$image_order_direction_options selected=$order.DIRECTION } - </select><br/> + </select><br> {/foreach} </fieldset> <p style="text-align:center;"> - <input class="submit" type="submit" value="{'Submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED}/> - <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset" /> + <input class="submit" type="submit" value="{'Submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED}> + <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset"> </p> {if isset($representant) } @@ -129,18 +129,18 @@ <tr> <td align="center"> {if isset($representant.picture) } - <a href="{$representant.picture.URL}"><img src="{$representant.picture.SRC}" alt="" class="miniature" /></a> + <a href="{$representant.picture.URL}"><img src="{$representant.picture.SRC}" alt="" class="miniature"></a> {else} - <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_representant_random.png" class="button" alt="{'Random picture'|@translate}" class="miniature" /> + <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_representant_random.png" class="button" alt="{'Random picture'|@translate}" class="miniature"> {/if} </td> <td> {if $representant.ALLOW_SET_RANDOM } - <p><input class="submit" type="submit" name="set_random_representant" value="{'cat_representant'|@translate}" {$TAG_INPUT_ENABLED}/></p> + <p><input class="submit" type="submit" name="set_random_representant" value="{'cat_representant'|@translate}" {$TAG_INPUT_ENABLED}></p> {/if} {if isset($representant.ALLOW_DELETE) } - <p><input class="submit" type="submit" name="delete_representant" value="{'Delete Representant'|@translate}" /></p> + <p><input class="submit" type="submit" name="delete_representant" value="{'Delete Representant'|@translate}"></p> {/if} </td> </tr> @@ -173,8 +173,8 @@ </table> <p> - <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitAdd" {$TAG_INPUT_ENABLED}/> - <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset" /> + <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitAdd" {$TAG_INPUT_ENABLED}> + <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset"> </p> </fieldset> @@ -194,8 +194,8 @@ </table> <p> - <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitDestinations" {$TAG_INPUT_ENABLED}/> - <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset" /> + <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitDestinations" {$TAG_INPUT_ENABLED}> + <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset"> </p> </fieldset> @@ -223,8 +223,8 @@ </table> <p> - <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitEmail" {$TAG_INPUT_ENABLED}/> - <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset" /> + <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitEmail" {$TAG_INPUT_ENABLED}> + <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset"> </p> </fieldset> diff --git a/admin/template/goto/cat_perm.tpl b/admin/template/goto/cat_perm.tpl index 858ff3723..aa135385c 100644 --- a/admin/template/goto/cat_perm.tpl +++ b/admin/template/goto/cat_perm.tpl @@ -13,10 +13,10 @@ <legend>{'Permission granted'|@translate}</legend> <ul> {foreach from=$group_granted_ids item=id} - <li><label><input type="checkbox" name="deny_groups[]" value="{$id}" /> {$all_groups[$id]}</label></li> + <li><label><input type="checkbox" name="deny_groups[]" value="{$id}"> {$all_groups[$id]}</label></li> {/foreach} </ul> - <input class="submit" type="submit" name="deny_groups_submit" value="{'Deny selected groups'|@translate}" {$TAG_INPUT_ENABLED}/> + <input class="submit" type="submit" name="deny_groups_submit" value="{'Deny selected groups'|@translate}" {$TAG_INPUT_ENABLED}> </fieldset> <fieldset> @@ -26,7 +26,7 @@ <li><label><input type="checkbox" name="grant_groups[]" value="{$id}"> {$all_groups[$id]}</label></li> {/foreach} </ul> - <input class="submit" type="submit" name="grant_groups_submit" value="{'Grant selected groups'|@translate}" {$TAG_INPUT_ENABLED}/> + <input class="submit" type="submit" name="grant_groups_submit" value="{'Grant selected groups'|@translate}" {$TAG_INPUT_ENABLED}> </fieldset> <h4>{'Users'|@translate}</h4> @@ -35,10 +35,10 @@ <legend>{'Permission granted'|@translate}</legend> <ul> {foreach from=$user_granted_direct_ids item=id} - <li><label><input type="checkbox" name="deny_users[]" value="{$id}" /> {$all_users[$id]}</label></li> + <li><label><input type="checkbox" name="deny_users[]" value="{$id}"> {$all_users[$id]}</label></li> {/foreach} </ul> - <input class="submit" type="submit" name="deny_users_submit" value="{'Deny selected users'|@translate}" {$TAG_INPUT_ENABLED}/> + <input class="submit" type="submit" name="deny_users_submit" value="{'Deny selected users'|@translate}" {$TAG_INPUT_ENABLED}> </fieldset> <fieldset> @@ -59,7 +59,7 @@ <li><label><input type="checkbox" name="grant_users[]" value="{$id}"> {$all_users[$id]}</label></li> {/foreach} </ul> - <input class="submit" type="submit" name="grant_users_submit" value="{'Grant selected users'|@translate}" {$TAG_INPUT_ENABLED}/> + <input class="submit" type="submit" name="grant_users_submit" value="{'Grant selected users'|@translate}" {$TAG_INPUT_ENABLED}> </fieldset> </form> diff --git a/admin/template/goto/check_integrity.tpl b/admin/template/goto/check_integrity.tpl index 3d1bfb5d1..d9019dbe7 100644 --- a/admin/template/goto/check_integrity.tpl +++ b/admin/template/goto/check_integrity.tpl @@ -16,7 +16,7 @@ <tr class="{if $smarty.foreach.c13y_loop.index is odd}row1{else}row2{/if}"> <td> {if $c13y.can_select} - <input type="checkbox" name="c13y_selection[]" value="{$c13y.id}" id="c13y_selection-{$c13y.id}" /><label for="c13y_selection-{$c13y.id}"></label> + <input type="checkbox" name="c13y_selection[]" value="{$c13y.id}" id="c13y_selection-{$c13y.id}"><label for="c13y_selection-{$c13y.id}"></label> {/if} </td> <td><label for="c13y_selection-{$c13y.id}">{$c13y.anomaly}</label></td> @@ -24,7 +24,7 @@ <label for="c13y_selection-{$c13y.id}"> {if $c13y.show_ignore_msg} {'c13y_ignore_msg1'|@translate} - <br /> + <br> {'c13y_ignore_msg2'|@translate} {/if} {if $c13y.show_correction_fct} @@ -38,12 +38,12 @@ {/if} {if !empty($c13y.correction_error_fct)} {'c13y_Correction_applied_error'|@translate} - <br /> + <br> {$c13y.c13y.correction_error_fct} {/if} {if !empty($c13y.correction_msg)} {if $c13y.show_correction_success_fct or !empty($c13y.correction_error_fct) or $c13y.show_correction_fct or $c13y.show_correction_bad_fct } - <br /> + <br> {/if} {$c13y.correction_msg|@nl2br} {/if} @@ -70,12 +70,12 @@ <p> {if $c13y_show_submit_automatic_correction} - <input class="submit" type="submit" value="{'c13y_submit_correction'|@translate}" name="c13y_submit_correction" {$TAG_INPUT_ENABLED} /> + <input class="submit" type="submit" value="{'c13y_submit_correction'|@translate}" name="c13y_submit_correction" {$TAG_INPUT_ENABLED}> {/if} {if $c13y_show_submit_ignore} - <input class="submit" type="submit" value="{'c13y_submit_ignore'|@translate}" name="c13y_submit_ignore" {$TAG_INPUT_ENABLED} /> + <input class="submit" type="submit" value="{'c13y_submit_ignore'|@translate}" name="c13y_submit_ignore" {$TAG_INPUT_ENABLED}> {/if} - <input class="submit" type="submit" value="{'c13y_submit_refresh'|@translate}" name="c13y_submit_refresh" /> + <input class="submit" type="submit" value="{'c13y_submit_refresh'|@translate}" name="c13y_submit_refresh"> </p> </fieldset> diff --git a/admin/template/goto/comments.tpl b/admin/template/goto/comments.tpl index d27b21a7d..8684f1d9b 100644 --- a/admin/template/goto/comments.tpl +++ b/admin/template/goto/comments.tpl @@ -10,23 +10,23 @@ {foreach from=$comments item=comment} <div class="comment"> - <a class="illustration" href="{$comment.U_PICTURE}"><img src="{$comment.TN_SRC}" /></a> + <a class="illustration" href="{$comment.U_PICTURE}"><img src="{$comment.TN_SRC}"></a> <p class="commentHeader"><strong>{$comment.AUTHOR}</strong> - <em>{$comment.DATE}</em></p> <blockquote>{$comment.CONTENT}</blockquote> </div> <ul class="actions"> - <li><label><input type="radio" name="action-{$comment.ID}" value="reject" />{'Reject'|@translate}</label></li> - <li><label><input type="radio" name="action-{$comment.ID}" value="validate" />{'Validate'|@translate}</label></li> + <li><label><input type="radio" name="action-{$comment.ID}" value="reject">{'Reject'|@translate}</label></li> + <li><label><input type="radio" name="action-{$comment.ID}" value="validate">{'Validate'|@translate}</label></li> </ul> {/foreach} <p class="bottomButtons"> - <input type="hidden" name="list" value="{$LIST}" /> - <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}/> - <input class="submit" type="submit" name="validate-all" value="{'Validate All'|@translate}" {$TAG_INPUT_ENABLED}/> - <input class="submit" type="submit" name="reject-all" value="{'Reject All'|@translate}" {$TAG_INPUT_ENABLED}/> - <input class="submit" type="reset" value="{'Reset'|@translate}" /> + <input type="hidden" name="list" value="{$LIST}"> + <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}> + <input class="submit" type="submit" name="validate-all" value="{'Validate All'|@translate}" {$TAG_INPUT_ENABLED}> + <input class="submit" type="submit" name="reject-all" value="{'Reject All'|@translate}" {$TAG_INPUT_ENABLED}> + <input class="submit" type="reset" value="{'Reset'|@translate}"> </p> </form> -{/if}
\ No newline at end of file +{/if} diff --git a/admin/template/goto/configuration.tpl b/admin/template/goto/configuration.tpl index 0c851082d..4823c9953 100644 --- a/admin/template/goto/configuration.tpl +++ b/admin/template/goto/configuration.tpl @@ -10,72 +10,73 @@ {if isset($main)} <fieldset id="mainConf"> + <legend></legend> <ul> <li> <span class="property"> <label for="gallery_title">{'Gallery title'|@translate}</label> </span> - <input type="text" maxlength="255" size="50" name="gallery_title" id="gallery_title" value="{$main.CONF_GALLERY_TITLE}" /> + <input type="text" maxlength="255" size="50" name="gallery_title" id="gallery_title" value="{$main.CONF_GALLERY_TITLE}"> </li> <li> <span class="property"> <label for="page_banner">{'Page banner'|@translate}</label> </span> - <textarea class="description" name="page_banner" id="page_banner">{$main.CONF_PAGE_BANNER}</textarea> + <textarea rows="5" cols="50" class="description" name="page_banner" id="page_banner">{$main.CONF_PAGE_BANNER}</textarea> </li> <li> <span class="property"> <label for="gallery_url">{'Gallery URL'|@translate}</label> </span> - <input type="text" maxlength="255" size="50" name="gallery_url" id="gallery_url" value="{$main.CONF_GALLERY_URL}" /> + <input type="text" maxlength="255" size="50" name="gallery_url" id="gallery_url" value="{$main.CONF_GALLERY_URL}"> </li> </ul> </fieldset> <fieldset id="mainConfCheck"> + <legend></legend> <ul> - <li> <label> <span class="property">{'Lock gallery'|@translate}</span> - <input type="checkbox" name="gallery_locked" {if ($main.gallery_locked)}checked="checked"{/if} /> + <input type="checkbox" name="gallery_locked" {if ($main.gallery_locked)}checked="checked"{/if}> </label> </li> <li> <label> <span class="property">{'Rating'|@translate}</span> - <input type="checkbox" name="rate" {if ($main.rate)}checked="checked"{/if} /> + <input type="checkbox" name="rate" {if ($main.rate)}checked="checked"{/if}> </label> </li> <li> <label> <span class="property">{'Rating by guests'|@translate}</span> - <input type="checkbox" name="rate_anonymous" {if ($main.rate_anonymous)}checked="checked"{/if} /> + <input type="checkbox" name="rate_anonymous" {if ($main.rate_anonymous)}checked="checked"{/if}> </label> </li> <li> <label> <span class="property">{'Allow user registration'|@translate}</span> - <input type="checkbox" name="allow_user_registration" {if ($main.allow_user_registration)}checked="checked"{/if} /> + <input type="checkbox" name="allow_user_registration" {if ($main.allow_user_registration)}checked="checked"{/if}> </label> </li> <li> <label> <span class="property">{'obligatory_user_mail_address'|@translate}</span> - <input type="checkbox" name="obligatory_user_mail_address" {if ($main.obligatory_user_mail_address)}checked="checked"{/if} /> + <input type="checkbox" name="obligatory_user_mail_address" {if ($main.obligatory_user_mail_address)}checked="checked"{/if}> </label> </li> <li> <label> <span class="property">{'Email administrators when a new user registers'|@translate}</span> - <input type="checkbox" name="email_admin_on_new_user" {if ($main.email_admin_on_new_user)}checked="checked"{/if} /> + <input type="checkbox" name="email_admin_on_new_user" {if ($main.email_admin_on_new_user)}checked="checked"{/if}> </label> </li> </ul> @@ -86,15 +87,15 @@ <fieldset id="historyConf"> <ul> <li> - <label><span class="property">{'conf_history_guest'|@translate}</span><input type="checkbox" name="history_guest" {if ($history.history_guest)}checked="checked"{/if} /></label> + <label><span class="property">{'conf_history_guest'|@translate}</span><input type="checkbox" name="history_guest" {if ($history.history_guest)}checked="checked"{/if}></label> </li> <li> - <label><span class="property">{'conf_history_user'|@translate}</span><input type="checkbox" name="log" {if ($history.log)}checked="checked"{/if} /></label> + <label><span class="property">{'conf_history_user'|@translate}</span><input type="checkbox" name="log" {if ($history.log)}checked="checked"{/if}></label> </li> <li> - <label><span class="property">{'conf_history_admin'|@translate}</span><input type="checkbox" name="history_admin" {if ($history.history_admin)}checked="checked"{/if} /></label> + <label><span class="property">{'conf_history_admin'|@translate}</span><input type="checkbox" name="history_admin" {if ($history.history_admin)}checked="checked"{/if}></label> </li> </ul> </fieldset> @@ -107,7 +108,7 @@ <li> <label> <span class="property">{'Comments for all'|@translate}</span> - <input type="checkbox" name="comments_forall" {if ($comments.comments_forall)}checked="checked"{/if} /> + <input type="checkbox" name="comments_forall" {if ($comments.comments_forall)}checked="checked"{/if}> </label> </li> @@ -115,13 +116,13 @@ <span class="property"> <label for="nb_comment_page">{'Number of comments per page'|@translate}</label> </span> - <input type="text" size="3" maxlength="4" name="nb_comment_page" id="nb_comment_page" value="{$comments.NB_COMMENTS_PAGE}" /> + <input type="text" size="3" maxlength="4" name="nb_comment_page" id="nb_comment_page" value="{$comments.NB_COMMENTS_PAGE}"> </li> <li> <label> <span class="property">{'Validation'|@translate}</span> - <input type="checkbox" name="comments_validation" {if ($comments.comments_validation)}checked="checked"{/if} /> + <input type="checkbox" name="comments_validation" {if ($comments.comments_validation)}checked="checked"{/if}> </label> </li> @@ -129,17 +130,16 @@ <li> <label> <span class="property">{'Email administrators when a valid comment is entered'|@translate}</span> - <input type="checkbox" name="email_admin_on_comment" {if ($comments.email_admin_on_comment)}checked="checked"{/if} /> + <input type="checkbox" name="email_admin_on_comment" {if ($comments.email_admin_on_comment)}checked="checked"{/if}> </label> </li> <li> <label> <span class="property">{'Email administrators when a comment requires validation'|@translate}</span> - <input type="checkbox" name="email_admin_on_comment_validation" {if ($comments.email_admin_on_comment_validation)}checked="checked"{/if} /> + <input type="checkbox" name="email_admin_on_comment_validation" {if ($comments.email_admin_on_comment_validation)}checked="checked"{/if}> </label> </li> - </ul> </fieldset> {/if} @@ -149,7 +149,7 @@ <ul> <li> <label><span class="property">{'Show upload link every time'|@translate}</span> - <input type="checkbox" name="upload_link_everytime" {if ($upload.upload_link_everytime)}checked="checked"{/if} /></label> + <input type="checkbox" name="upload_link_everytime" {if ($upload.upload_link_everytime)}checked="checked"{/if}></label> </li> <li> <label><span class="property">{'User access level to upload'|@translate}</span> @@ -158,7 +158,7 @@ <li> <label> <span class="property">{'Email administrators when a picture is uploaded'|@translate}</span> - <input type="checkbox" name="email_admin_on_picture_uploaded" {if ($upload.email_admin_on_picture_uploaded)}checked="checked"{/if} /> + <input type="checkbox" name="email_admin_on_picture_uploaded" {if ($upload.email_admin_on_picture_uploaded)}checked="checked"{/if}> </label> </li> </ul> @@ -175,4 +175,4 @@ <input class="submit" type="reset" name="reset" value="{'Reset'|@translate}"> </p> {/if} -</form>
\ No newline at end of file +</form> diff --git a/admin/template/goto/double_select.tpl b/admin/template/goto/double_select.tpl index 2be698b0d..b42ca8403 100644 --- a/admin/template/goto/double_select.tpl +++ b/admin/template/goto/double_select.tpl @@ -9,7 +9,7 @@ <select class="categoryList" name="cat_true[]" multiple="multiple" size="30"> {html_options options=$category_option_true selected=$category_option_true_selected} </select> - <p><input class="submit" type="submit" value="»" name="falsify" style="font-size:15px;" {$TAG_INPUT_ENABLED}/></p> + <p><input class="submit" type="submit" value="»" name="falsify" style="font-size:15px;" {$TAG_INPUT_ENABLED}></p> </td> <td> @@ -17,7 +17,7 @@ <select class="categoryList" name="cat_false[]" multiple="multiple" size="30"> {html_options options=$category_option_false selected=$category_option_false_selected} </select> - <p><input class="submit" type="submit" value="«" name="trueify" style="font-size:15px;" {$TAG_INPUT_ENABLED}/></p> + <p><input class="submit" type="submit" value="«" name="trueify" style="font-size:15px;" {$TAG_INPUT_ENABLED}></p> </td> </tr> </table> diff --git a/admin/template/goto/element_set_global.tpl b/admin/template/goto/element_set_global.tpl index a9c5173f0..c34c33e06 100644 --- a/admin/template/goto/element_set_global.tpl +++ b/admin/template/goto/element_set_global.tpl @@ -53,9 +53,9 @@ <img src="{$thumbnail.TN_SRC}" alt="{$thumbnail.FILE}" title="{$thumbnail.TITLE}" - class="thumbnail" /> + class="thumbnail"> </span></span> - <input type="checkbox" name="selection[]" value="{$thumbnail.ID}" /> + <input type="checkbox" name="selection[]" value="{$thumbnail.ID}"> </label> </span> </li> @@ -71,12 +71,12 @@ <p style="font-style:italic">{'Note: Only deletes photos added with pLoader'|@translate}</p> <p> {'target'|@translate} - <label><input type="radio" name="target_deletion" value="all" /> {'all'|@translate}</label> - <label><input type="radio" name="target_deletion" value="selection" checked="checked" /> {'selection'|@translate}</label> + <label><input type="radio" name="target_deletion" value="all"> {'all'|@translate}</label> + <label><input type="radio" name="target_deletion" value="selection" checked="checked"> {'selection'|@translate}</label> </p> <p> - <label><input type="checkbox" name="confirm_deletion" value="1" /> {'confirm'|@translate}</label> - <input class="submit" type="submit" value="{'Delete selected photos'|@translate}" name="delete" {$TAG_INPUT_ENABLED}/> + <label><input type="checkbox" name="confirm_deletion" value="1"> {'confirm'|@translate}</label> + <input class="submit" type="submit" value="{'Delete selected photos'|@translate}" name="delete" {$TAG_INPUT_ENABLED}> </p> </fieldset> {/if} @@ -122,29 +122,29 @@ <tr> <td>{'Author'|@translate}</td> <td> - <label><input type="radio" name="author_action" value="leave" checked="checked" /> {'leave'|@translate}</label> - <label><input type="radio" name="author_action" value="unset" /> {'unset'|@translate}</label> - <label><input type="radio" name="author_action" value="set" id="author_action_set" /> {'set to'|@translate}</label> - <input onchange="document.getElementById('author_action_set').checked = true;" type="text" class="large" name="author" value="" /> + <label><input type="radio" name="author_action" value="leave" checked="checked"> {'leave'|@translate}</label> + <label><input type="radio" name="author_action" value="unset"> {'unset'|@translate}</label> + <label><input type="radio" name="author_action" value="set" id="author_action_set"> {'set to'|@translate}</label> + <input onchange="document.getElementById('author_action_set').checked = true;" type="text" class="large" name="author" value=""> </td> </tr> <tr> <td>{'title'|@translate}</td> <td> - <label><input type="radio" name="name_action" value="leave" checked="checked" /> {'leave'|@translate}</label> - <label><input type="radio" name="name_action" value="unset" /> {'unset'|@translate}</label> - <label><input type="radio" name="name_action" value="set" id="name_action_set" /> {'set to'|@translate}</label> - <input onchange="document.getElementById('name_action_set').checked = true;" type="text" class="large" name="name" value="" /> + <label><input type="radio" name="name_action" value="leave" checked="checked"> {'leave'|@translate}</label> + <label><input type="radio" name="name_action" value="unset"> {'unset'|@translate}</label> + <label><input type="radio" name="name_action" value="set" id="name_action_set"> {'set to'|@translate}</label> + <input onchange="document.getElementById('name_action_set').checked = true;" type="text" class="large" name="name" value=""> </td> </tr> <tr> <td>{'Creation date'|@translate}</td> <td> - <label><input type="radio" name="date_creation_action" value="leave" checked="checked" /> {'leave'|@translate}</label> - <label><input type="radio" name="date_creation_action" value="unset" /> {'unset'|@translate}</label> - <label><input type="radio" name="date_creation_action" value="set" id="date_creation_action_set" /> {'set to'|@translate}</label> + <label><input type="radio" name="date_creation_action" value="leave" checked="checked"> {'leave'|@translate}</label> + <label><input type="radio" name="date_creation_action" value="unset"> {'unset'|@translate}</label> + <label><input type="radio" name="date_creation_action" value="set" id="date_creation_action_set"> {'set to'|@translate}</label> <select id="date_creation_day" name="date_creation_day"> <option value="0">--</option> {section name=day start=1 loop=32} @@ -159,16 +159,16 @@ type="text" size="4" maxlength="4" - value="{$DATE_CREATION_YEAR}" /> - <input id="date_creation_linked_date" name="date_creation_linked_date" type="hidden" size="10" disabled="disabled"/> + value="{$DATE_CREATION_YEAR}"> + <input id="date_creation_linked_date" name="date_creation_linked_date" type="hidden" size="10" disabled="disabled"> </td> </tr> <tr> <td>{'Minimum privacy level'|@translate}</td> <td> - <label><input type="radio" name="level_action" value="leave" checked="checked" />{'leave'|@translate}</label> - <label><input type="radio" name="level_action" value="set" id="level_action_set" />{'set to'|@translate}</label> + <label><input type="radio" name="level_action" value="leave" checked="checked">{'leave'|@translate}</label> + <label><input type="radio" name="level_action" value="set" id="level_action_set">{'set to'|@translate}</label> <select onchange="document.getElementById('level_action_set').checked = true;" name="level" size="1"> {html_options options=$level_options} </select> @@ -179,12 +179,12 @@ <p> {'target'|@translate} - <label><input type="radio" name="target" value="all" /> {'all'|@translate}</label> - <label><input type="radio" name="target" value="selection" checked="checked" /> {'selection'|@translate}</label> + <label><input type="radio" name="target" value="all"> {'all'|@translate}</label> + <label><input type="radio" name="target" value="selection" checked="checked"> {'selection'|@translate}</label> </p> - <p><input class="submit" type="submit" value="{'Submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED}/></p> + <p><input class="submit" type="submit" value="{'Submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED}></p> </fieldset> @@ -194,14 +194,14 @@ <ul style="list-style-type:none;"> {if ($IN_CADDIE)} - <li><label><input type="radio" name="caddie_action" value="empty_all" /> {'Empty caddie'|@translate}</label></li> - <li><label><input type="radio" name="caddie_action" value="empty_selected" /> {'Take selected elements out of caddie'|@translate}</label></li> + <li><label><input type="radio" name="caddie_action" value="empty_all"> {'Empty caddie'|@translate}</label></li> + <li><label><input type="radio" name="caddie_action" value="empty_selected"> {'Take selected elements out of caddie'|@translate}</label></li> {else} - <li><label><input type="radio" name="caddie_action" value="add_selected" /> {'Add selected elements to caddie'|@translate}</label></li> + <li><label><input type="radio" name="caddie_action" value="add_selected"> {'Add selected elements to caddie'|@translate}</label></li> {/if} </ul> - <p><input class="submit" type="submit" value="{'Submit'|@translate}" name="submit_caddie" /></p> + <p><input class="submit" type="submit" value="{'Submit'|@translate}" name="submit_caddie"></p> </fieldset> diff --git a/admin/template/goto/element_set_ranks.tpl b/admin/template/goto/element_set_ranks.tpl index 31e614480..5f134190d 100644 --- a/admin/template/goto/element_set_ranks.tpl +++ b/admin/template/goto/element_set_ranks.tpl @@ -20,9 +20,9 @@ <em class="levelIndicatorF" title="{$pwg->l10n($pwg->sprintf('Level %d',$thumbnail.LEVEL))}">{$thumbnail.LEVEL}</em> {/if} <span> - <img src="{$thumbnail.TN_SRC}" class="thumbnail" /> + <img src="{$thumbnail.TN_SRC}" class="thumbnail"> </span></span> - <input style="height:12px; width:50px;" type="text" name="rank_of_image[{$thumbnail.ID}]" value="{$thumbnail.RANK}" /> + <input style="height:12px; width:50px;" type="text" name="rank_of_image[{$thumbnail.ID}]" value="{$thumbnail.RANK}"> </label> </span> </li> @@ -30,7 +30,7 @@ </ul> {/if} - <p><input class="submit" type="submit" value="{'Submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED}/></p> + <p><input class="submit" type="submit" value="{'Submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED}></p> </fieldset> diff --git a/admin/template/goto/element_set_unit.tpl b/admin/template/goto/element_set_unit.tpl index cb374e9d9..0520e4e59 100644 --- a/admin/template/goto/element_set_unit.tpl +++ b/admin/template/goto/element_set_unit.tpl @@ -27,30 +27,30 @@ {if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if} {if !empty($elements) } -<input type="hidden" name="element_ids" value="{$ELEMENT_IDS}" /> +<input type="hidden" name="element_ids" value="{$ELEMENT_IDS}"> {foreach from=$elements item=element} <fieldset class="elementEdit"> <legend>{$element.LEGEND}</legend> - <a href="{$element.U_EDIT}"><img src="{$element.TN_SRC}" alt="" title="{'Edit all picture informations'|@translate}" /></a> + <a href="{$element.U_EDIT}"><img src="{$element.TN_SRC}" alt="" title="{'Edit all picture informations'|@translate}"></a> <table> <tr> <td><strong>{'Name'|@translate}</strong></td> - <td><input type="text" class="large" name="name-{$element.ID}" value="{$element.NAME}" /></td> + <td><input type="text" class="large" name="name-{$element.ID}" value="{$element.NAME}"></td> </tr> <tr> <td><strong>{'Author'|@translate}</strong></td> - <td><input type="text" class="large" name="author-{$element.ID}" value="{$element.AUTHOR}" /></td> + <td><input type="text" class="large" name="author-{$element.ID}" value="{$element.AUTHOR}"></td> </tr> <tr> <td><strong>{'Creation date'|@translate}</strong></td> <td> - <label><input type="radio" name="date_creation_action-{$element.ID}" value="unset" /> {'unset'|@translate}</label> - <label><input type="radio" name="date_creation_action-{$element.ID}" value="set" id="date_creation_action_set-{$element.ID}" /> {'set to'|@translate}</label> + <label><input type="radio" name="date_creation_action-{$element.ID}" value="unset"> {'unset'|@translate}</label> + <label><input type="radio" name="date_creation_action-{$element.ID}" value="set" id="date_creation_action_set-{$element.ID}"> {'set to'|@translate}</label> <select id="date_creation_day-{$element.ID}" name="date_creation_day-{$element.ID}"> <option value="0">--</option> @@ -66,8 +66,8 @@ type="text" size="4" maxlength="4" - value="{$element.DATE_CREATION_YEAR}" /> - <input id="date_creation_linked_date-{$element.ID}" name="date_creation_linked_date-{$element.ID}" type="hidden" size="10" disabled="disabled"/> + value="{$element.DATE_CREATION_YEAR}"> + <input id="date_creation_linked_date-{$element.ID}" name="date_creation_linked_date-{$element.ID}" type="hidden" size="10" disabled="disabled"> <script type="text/javascript"> pwg_initialization_datepicker("#date_creation_day-{$element.ID}", "#date_creation_month-{$element.ID}", "#date_creation_year-{$element.ID}", "#date_creation_linked_date-{$element.ID}", "#date_creation_action_set-{$element.ID}"); </script> @@ -90,8 +90,8 @@ {/foreach} <p> - <input class="submit" type="submit" value="{'Submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED}/> - <input class="submit" type="reset" value="{'Reset'|@translate}" /> + <input class="submit" type="submit" value="{'Submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED}> + <input class="submit" type="reset" value="{'Reset'|@translate}"> </p> {/if} @@ -107,4 +107,4 @@ }); });{/literal} // ]]> -</script>
\ No newline at end of file +</script> diff --git a/admin/template/goto/extend_for_templates.tpl b/admin/template/goto/extend_for_templates.tpl index dae6903a5..9ed880b63 100644 --- a/admin/template/goto/extend_for_templates.tpl +++ b/admin/template/goto/extend_for_templates.tpl @@ -14,7 +14,7 @@ {foreach from=$extents item=tpl name=extent_loop} <tr class="{if $smarty.foreach.extent_loop.index is odd}row1{else}row2{/if}"> <td> - <input type="hidden" name=reptpl[] value="{$tpl.replacer}" /> + <input type="hidden" name=reptpl[] value="{$tpl.replacer}"> {$tpl.replacer} </td> <td> @@ -31,8 +31,8 @@ </table> {if !is_adviser()} <p> - <input class="submit" type="submit" value="{'Submit'|@translate}" name="submit" /> + <input class="submit" type="submit" value="{'Submit'|@translate}" name="submit"> </p> {/if} </form> -{/if}
\ No newline at end of file +{/if} diff --git a/admin/template/goto/group_list.tpl b/admin/template/goto/group_list.tpl index b21c2ec86..cdd07eb85 100644 --- a/admin/template/goto/group_list.tpl +++ b/admin/template/goto/group_list.tpl @@ -10,10 +10,10 @@ <span class="property"> <label for="groupname">{'Group name'|@translate}</label> </span> - <input type="text" id="groupname" name="groupname" maxlength="50" size="20" /> + <input type="text" id="groupname" name="groupname" maxlength="50" size="20"> <p> - <input class="submit" type="submit" name="submit_add" value="{'Add'|@translate}" {$TAG_INPUT_ENABLED}/> + <input class="submit" type="submit" name="submit_add" value="{'Add'|@translate}" {$TAG_INPUT_ENABLED}> </p> </fieldset> </form> @@ -31,11 +31,11 @@ <td><a href="{$group.U_MEMBERS}">{$group.MEMBERS}</a></td> <td style="text-align:center;"> <a href="{$group.U_PERM}"> - <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/permissions.png" class="button" style="border:none" id="btn_permissions" alt="{'permissions'|@translate}" title="{'permissions'|@translate}" /></a> + <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/permissions.png" class="button" style="border:none" id="btn_permissions" alt="{'permissions'|@translate}" title="{'permissions'|@translate}"></a> <a href="{$group.U_DELETE}" onclick="return confirm( document.getElementById('btn_delete').title + '\n\n' + '{'Are you sure?'|@translate|@escape:'javascript'}');"> - <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/delete.png" class="button" style="border:none" id="btn_delete" alt="{'delete'|@translate}" title="{'delete'|@translate}" {$TAG_INPUT_ENABLED}/></a> + <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/delete.png" class="button" style="border:none" id="btn_delete" alt="{'delete'|@translate}" title="{'delete'|@translate}" {$TAG_INPUT_ENABLED}></a> <a href="{$group.U_ISDEFAULT}" onclick="return confirm( document.getElementById('btn_toggle_is_default_group').title + '\n\n' + '{'Are you sure?'|@translate|@escape:'javascript'}');"> - <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/toggle_is_default_group.png" class="button" style="border:none" id="btn_toggle_is_default_group" alt="{'toggle_is_default_group'|@translate}" title="{'toggle_is_default_group'|@translate}" {$TAG_INPUT_ENABLED}/></a> + <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/toggle_is_default_group.png" class="button" style="border:none" id="btn_toggle_is_default_group" alt="{'toggle_is_default_group'|@translate}" title="{'toggle_is_default_group'|@translate}" {$TAG_INPUT_ENABLED}></a> </td> </tr> {/foreach} diff --git a/admin/template/goto/history.tpl b/admin/template/goto/history.tpl index ea9583e6a..670b93694 100644 --- a/admin/template/goto/history.tpl +++ b/admin/template/goto/history.tpl @@ -29,7 +29,7 @@ {html_options options=$month_list selected=$START_MONTH_SELECTED} </select> <input id="start_year" name="start_year" value="{$START_YEAR}" type="text" size="4" maxlength="4" > - <input id="start_linked_date" name="start_linked_date" type="hidden" size="10" disabled="disabled"/> + <input id="start_linked_date" name="start_linked_date" type="hidden" size="10" disabled="disabled"> </li> </ul> <ul> @@ -45,7 +45,7 @@ {html_options options=$month_list selected=$END_MONTH_SELECTED} </select> <input id="end_year" name="end_year" value="{$END_YEAR}" type="text" size="4" maxlength="4" > - <input id="end_linked_date" name="end_linked_date" type="hidden" size="10" disabled="disabled"/> + <input id="end_linked_date" name="end_linked_date" type="hidden" size="10" disabled="disabled"> </li> </ul> @@ -81,7 +81,7 @@ </select> </label> - <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}" /> + <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}"> </fieldset> </form> diff --git a/admin/template/goto/install.tpl b/admin/template/goto/install.tpl index d7f6bd82f..b9ddb1316 100644 --- a/admin/template/goto/install.tpl +++ b/admin/template/goto/install.tpl @@ -87,27 +87,27 @@ TD { </tr> <tr> <td style="width: 30%;">{'step1_host'|@translate}</td> - <td align=center><input type="text" name="dbhost" value="{$F_DB_HOST}" /></td> + <td align=center><input type="text" name="dbhost" value="{$F_DB_HOST}"></td> <td>{'step1_host_info'|@translate}</td> </tr> <tr> <td>{'step1_user'|@translate}</td> - <td align=center><input type="text" name="dbuser" value="{$F_DB_USER}" /></td> + <td align=center><input type="text" name="dbuser" value="{$F_DB_USER}"></td> <td>{'step1_user_info'|@translate}</td> </tr> <tr> <td>{'step1_pass'|@translate}</td> - <td align=center><input type="password" name="dbpasswd" value="" /></td> + <td align=center><input type="password" name="dbpasswd" value=""></td> <td>{'step1_pass_info'|@translate}</td> </tr> <tr> <td>{'step1_database'|@translate}</td> - <td align=center><input type="text" name="dbname" value="{$F_DB_NAME}" /></td> + <td align=center><input type="text" name="dbname" value="{$F_DB_NAME}"></td> <td>{'step1_database_info'|@translate}</td> </tr> <tr> <td>{'step1_prefix'|@translate}</td> - <td align=center><input type="text" name="prefix" value="{$F_DB_PREFIX}" /></td> + <td align=center><input type="text" name="prefix" value="{$F_DB_PREFIX}"></td> <td>{'step1_prefix_info'|@translate}</td> </tr> </table> @@ -118,22 +118,22 @@ TD { </tr> <tr> <td style="width: 30%;">{'install_webmaster'|@translate}</td> - <td align="center"><input type="text" name="admin_name" value="{$F_ADMIN}" /></td> + <td align="center"><input type="text" name="admin_name" value="{$F_ADMIN}"></td> <td>{'install_webmaster_info'|@translate}</td> </tr> <tr> <td>{'step2_pwd'|@translate}</td> - <td align="center"><input type="password" name="admin_pass1" value="" /></td> + <td align="center"><input type="password" name="admin_pass1" value=""></td> <td>{'step2_pwd_info'|@translate}</td> </tr> <tr> <td>{'step2_pwd_conf'|@translate}</td> - <td align="center"><input type="password" name="admin_pass2" value="" /></td> + <td align="center"><input type="password" name="admin_pass2" value=""></td> <td>{'step2_pwd_conf_info'|@translate}</td> </tr> <tr> <td>{'conf_mail_webmaster'|@translate}</td> - <td align="center"><input type="text" name="admin_mail" value="{$F_ADMIN_EMAIL}" /></td> + <td align="center"><input type="text" name="admin_mail" value="{$F_ADMIN_EMAIL}"></td> <td>{'conf_mail_webmaster_info'|@translate}</td> </tr> </table> @@ -141,16 +141,16 @@ TD { <table> <tr> <td style="text-align: center;"> - <input class="submit" type="submit" name="install" value="{'Start_Install'|@translate}" /> + <input class="submit" type="submit" name="install" value="{'Start_Install'|@translate}"> </td> </tr> </table> </form> {else} <p> - <br /> - <input type="button" name="index" value="{'home'|@translate}" onClick="document.location = 'index.php';"/> - <input type="button" name="identification" value="{'Identification'|@translate}" onClick="document.location = 'identification.php';"/> + <br> + <input type="button" name="index" value="{'home'|@translate}" onClick="document.location = 'index.php';"> + <input type="button" name="identification" value="{'Identification'|@translate}" onClick="document.location = 'identification.php';"> </p> {/if} </div> {* content *} diff --git a/admin/template/goto/intro.tpl b/admin/template/goto/intro.tpl index 2bde582f3..d9cafde2a 100644 --- a/admin/template/goto/intro.tpl +++ b/admin/template/goto/intro.tpl @@ -50,16 +50,16 @@ <form name="QuickSynchro" action="{$U_CAT_UPDATE}" method="post" id="QuickSynchro" style="display: block; text-align:right;"> <div> -<input type="hidden" name="sync" value="files" checked="checked" /> -<input type="hidden" name="display_info" value="1" checked="checked" /> -<input type="hidden" name="add_to_caddie" value="1" checked="checked" /> -<input type="hidden" name="privacy_level" value="0" checked="checked" /> -<input type="hidden" name="sync_meta" checked="checked"/> -<input type="hidden" name="simulate" value="0" /> -<input type="hidden" name="subcats-included" value="1" checked="checked"/> +<input type="hidden" name="sync" value="files" checked="checked"> +<input type="hidden" name="display_info" value="1" checked="checked"> +<input type="hidden" name="add_to_caddie" value="1" checked="checked"> +<input type="hidden" name="privacy_level" value="0" checked="checked"> +<input type="hidden" name="sync_meta" checked="checked"> +<input type="hidden" name="simulate" value="0"> +<input type="hidden" name="subcats-included" value="1" checked="checked"> </div> <div class="bigbutton"> <span class="bigtext">{'Quick Local Synchronization'|@translate}</span> <input type="submit" value="" name="submit"> </div> -</form>
\ No newline at end of file +</form> diff --git a/admin/template/goto/menubar.tpl b/admin/template/goto/menubar.tpl index 7ce3d29e7..b03575a85 100644 --- a/admin/template/goto/menubar.tpl +++ b/admin/template/goto/menubar.tpl @@ -24,7 +24,7 @@ {/foreach} </table> <p> - <input type="submit" name="submit" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}/> - <input type="submit" name="reset" value="{'Reset'|@translate}" {$TAG_INPUT_ENABLED}/> + <input type="submit" name="submit" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}> + <input type="submit" name="reset" value="{'Reset'|@translate}" {$TAG_INPUT_ENABLED}> </p> -</form>
\ No newline at end of file +</form> diff --git a/admin/template/goto/notification_by_mail.tpl b/admin/template/goto/notification_by_mail.tpl index 375093d01..7309f4a94 100644 --- a/admin/template/goto/notification_by_mail.tpl +++ b/admin/template/goto/notification_by_mail.tpl @@ -10,7 +10,7 @@ {if isset($REPOST_SUBMIT_NAME)} <fieldset> <div class="infos"> - <input class="submit" type="submit" value="{'nbm_repost_submit'|@translate}" name="{$REPOST_SUBMIT_NAME}" {$TAG_INPUT_ENABLED}/> + <input class="submit" type="submit" value="{'nbm_repost_submit'|@translate}" name="{$REPOST_SUBMIT_NAME}" {$TAG_INPUT_ENABLED}> </div> </fieldset> {/if} @@ -22,22 +22,22 @@ <tr> <td><label>{'nbm_send_html_mail'|@translate}</label></td> <td> - <label><input type="radio" name="nbm_send_html_mail" value="true" {if $param.SEND_HTML_MAIL}checked="checked"{/if}/>{'Yes'|@translate}</label> - <label><input type="radio" name="nbm_send_html_mail" value="false" {if not $param.SEND_HTML_MAIL}checked="checked"{/if}/>{'No'|@translate}</label> + <label><input type="radio" name="nbm_send_html_mail" value="true" {if $param.SEND_HTML_MAIL}checked="checked"{/if}>{'Yes'|@translate}</label> + <label><input type="radio" name="nbm_send_html_mail" value="false" {if not $param.SEND_HTML_MAIL}checked="checked"{/if}>{'No'|@translate}</label> </td> </tr> <tr> <td> <label for="send_mail_as">{'nbm_send_mail_as'|@translate}</label> - <br/><i><small>{'nbm_info_send_mail_as'|@translate}</small></i> + <br><i><small>{'nbm_info_send_mail_as'|@translate}</small></i> </td> - <td><input type="text" maxlength="35" size="35" name="nbm_send_mail_as" id="send_mail_as" value="{$param.SEND_MAIL_AS}"/></td> + <td><input type="text" maxlength="35" size="35" name="nbm_send_mail_as" id="send_mail_as" value="{$param.SEND_MAIL_AS}"></td> </tr> <tr> <td><label>{'nbm_send_detailed_content'|@translate}</label></td> <td> - <label><input type="radio" name="nbm_send_detailed_content" value="true" {if $param.SEND_DETAILED_CONTENT}checked="checked"{/if}/>{'Yes'|@translate}</label> - <label><input type="radio" name="nbm_send_detailed_content" value="false" {if not $param.SEND_DETAILED_CONTENT}checked="checked"{/if}/>{'No'|@translate}</label> + <label><input type="radio" name="nbm_send_detailed_content" value="true" {if $param.SEND_DETAILED_CONTENT}checked="checked"{/if}>{'Yes'|@translate}</label> + <label><input type="radio" name="nbm_send_detailed_content" value="false" {if not $param.SEND_DETAILED_CONTENT}checked="checked"{/if}>{'No'|@translate}</label> </td> </tr> <tr> @@ -47,19 +47,19 @@ <tr> <td> <label>{'nbm_send_recent_post_dates'|@translate}</label> - <br/><i><small>{'nbm_info_send_recent_post_dates'|@translate}</small></i> + <br><i><small>{'nbm_info_send_recent_post_dates'|@translate}</small></i> </td> <td> - <label><input type="radio" name="nbm_send_recent_post_dates" value="true" {if $param.SEND_RECENT_POST_DATES}checked="checked"{/if}/>{'Yes'|@translate}</label> - <label><input type="radio" name="nbm_send_recent_post_dates" value="false" {if not $param.SEND_RECENT_POST_DATES}checked="checked"{/if}/>{'No'|@translate}</label> + <label><input type="radio" name="nbm_send_recent_post_dates" value="true" {if $param.SEND_RECENT_POST_DATES}checked="checked"{/if}>{'Yes'|@translate}</label> + <label><input type="radio" name="nbm_send_recent_post_dates" value="false" {if not $param.SEND_RECENT_POST_DATES}checked="checked"{/if}>{'No'|@translate}</label> </td> </tr> </table> </fieldset> <p> - <input class="submit" type="submit" value="{'Submit'|@translate}" name="param_submit" {$TAG_INPUT_ENABLED}/> - <input class="submit" type="reset" value="{'Reset'|@translate}" name="param_reset"/> + <input class="submit" type="submit" value="{'Submit'|@translate}" name="param_submit" {$TAG_INPUT_ENABLED}> + <input class="submit" type="reset" value="{'Reset'|@translate}" name="param_reset"> </p> {/if}{* isset $param*} @@ -93,7 +93,7 @@ <td><label for="send_selection-{$u.ID}">{$u.USERNAME}</label></td> <td><label for="send_selection-{$u.ID}">{$u.EMAIL}</label></td> <td><label for="send_selection-{$u.ID}">{$u.LAST_SEND}</label></td> - <td><input type="checkbox" name="send_selection[]" value="{$u.ID}" {$u.CHECKED} id="send_selection-{$u.ID}"/></td> + <td><input type="checkbox" name="send_selection[]" value="{$u.ID}" {$u.CHECKED} id="send_selection-{$u.ID}"></td> </tr> {/foreach} </table> @@ -114,7 +114,7 @@ </fieldset> <p> - <input class="submit" type="submit" value="{'nbm_send_submit'|@translate}" name="send_submit" {$TAG_INPUT_ENABLED}/> + <input class="submit" type="submit" value="{'nbm_send_submit'|@translate}" name="send_submit" {$TAG_INPUT_ENABLED}> </p> {/if} {/if}{* isset $send*} diff --git a/admin/template/goto/permalinks.tpl b/admin/template/goto/permalinks.tpl index 3e04cc3d0..1f2164721 100644 --- a/admin/template/goto/permalinks.tpl +++ b/admin/template/goto/permalinks.tpl @@ -13,15 +13,15 @@ </label> <label>{'Permalink'|@translate}: - <input name="permalink" /> + <input name="permalink"> </label> <label>{'Save to permalink history'|@translate}: - <input type="checkbox" name="save" checked="checked" /> + <input type="checkbox" name="save" checked="checked"> </label> <p> - <input type="submit" class="submit" name="set_permalink" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}/> + <input type="submit" class="submit" name="set_permalink" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}> </p> </fieldset> </form> diff --git a/admin/template/goto/picture_modify.tpl b/admin/template/goto/picture_modify.tpl index 65bc8f407..f6c259a53 100644 --- a/admin/template/goto/picture_modify.tpl +++ b/admin/template/goto/picture_modify.tpl @@ -12,14 +12,14 @@ <h2>{'title_picmod'|@translate}</h2> -<img src="{$TN_SRC}" alt="{'thumbnail'|@translate}" class="thumbnail" /> +<img src="{$TN_SRC}" alt="{'thumbnail'|@translate}" class="thumbnail"> <ul class="categoryActions"> {if isset($U_JUMPTO) } - <li><a href="{$U_JUMPTO}" title="{'jump to image'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_jump-to.png" class="button" alt="{'jump to image'|@translate}" /></a></li> + <li><a href="{$U_JUMPTO}" title="{'jump to image'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_jump-to.png" class="button" alt="{'jump to image'|@translate}"></a></li> {/if} {if !url_is_remote($path)} - <li><a href="{$U_SYNC}" title="{'synchronize metadata'|@translate}" {$TAG_INPUT_ENABLED}><img src="{$themeconf.admin_icon_dir}/sync_metadata.png" class="button" alt="{'synchronize'|@translate}" /></a></li> + <li><a href="{$U_SYNC}" title="{'synchronize metadata'|@translate}" {$TAG_INPUT_ENABLED}><img src="{$themeconf.admin_icon_dir}/sync_metadata.png" class="button" alt="{'synchronize'|@translate}"></a></li> {/if} </ul> @@ -86,19 +86,19 @@ <tr> <td><strong>{'Name'|@translate}</strong></td> - <td><input type="text" class="large" name="name" value="{$NAME}" /></td> + <td><input type="text" class="large" name="name" value="{$NAME}"></td> </tr> <tr> <td><strong>{'Author'|@translate}</strong></td> - <td><input type="text" class="large" name="author" value="{$AUTHOR}" /></td> + <td><input type="text" class="large" name="author" value="{$AUTHOR}"></td> </tr> <tr> <td><strong>{'Creation date'|@translate}</strong></td> <td> - <label><input type="radio" name="date_creation_action" value="unset" /> {'unset'|@translate}</label> - <input type="radio" name="date_creation_action" value="set" id="date_creation_action_set" /> {'set to'|@translate} + <label><input type="radio" name="date_creation_action" value="unset"> {'unset'|@translate}</label> + <input type="radio" name="date_creation_action" value="set" id="date_creation_action_set"> {'set to'|@translate} <select id="date_creation_day" name="date_creation_day"> <option value="0">--</option> {section name=day start=1 loop=32} @@ -113,8 +113,8 @@ type="text" size="4" maxlength="4" - value="{$DATE_CREATION_YEAR_VALUE}" /> - <input id="date_creation_linked_date" name="date_creation_linked_date" type="hidden" size="10" disabled="disabled"/> + value="{$DATE_CREATION_YEAR_VALUE}"> + <input id="date_creation_linked_date" name="date_creation_linked_date" type="hidden" size="10" disabled="disabled"> </td> </tr> @@ -141,8 +141,8 @@ </table> <p style="text-align:center;"> - <input class="submit" type="submit" value="{'Submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED}/> - <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset" /> + <input class="submit" type="submit" value="{'Submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED}> + <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset"> </p> </fieldset> @@ -160,7 +160,7 @@ <select class="categoryList" name="cat_associated[]" multiple="multiple" size="30"> {html_options options=$associated_options} </select> - <p><input class="submit" type="submit" value="»" name="dissociate" style="font-size:15px;" {$TAG_INPUT_ENABLED}/></p> + <p><input class="submit" type="submit" value="»" name="dissociate" style="font-size:15px;" {$TAG_INPUT_ENABLED}></p> </td> <td> @@ -168,7 +168,7 @@ <select class="categoryList" name="cat_dissociated[]" multiple="multiple" size="30"> {html_options options=$dissociated_options} </select> - <p><input class="submit" type="submit" value="«" name="associate" style="font-size:15px;" {$TAG_INPUT_ENABLED}/></p> + <p><input class="submit" type="submit" value="«" name="associate" style="font-size:15px;" {$TAG_INPUT_ENABLED}></p> </td> </tr> </table> @@ -187,7 +187,7 @@ <select class="categoryList" name="cat_elected[]" multiple="multiple" size="30"> {html_options options=$elected_options} </select> - <p><input class="submit" type="submit" value="»" name="dismiss" style="font-size:15px;" {$TAG_INPUT_ENABLED}/></p> + <p><input class="submit" type="submit" value="»" name="dismiss" style="font-size:15px;" {$TAG_INPUT_ENABLED}></p> </td> <td> @@ -195,7 +195,7 @@ <select class="categoryList" name="cat_dismissed[]" multiple="multiple" size="30"> {html_options options=$dismissed_options} </select> - <p><input class="submit" type="submit" value="«" name="elect" style="font-size:15px;" {$TAG_INPUT_ENABLED}/></p> + <p><input class="submit" type="submit" value="«" name="elect" style="font-size:15px;" {$TAG_INPUT_ENABLED}></p> </td> </tr> </table> diff --git a/admin/template/goto/plugins_list.tpl b/admin/template/goto/plugins_list.tpl index 96b1f2b1a..7f8ee5cef 100644 --- a/admin/template/goto/plugins_list.tpl +++ b/admin/template/goto/plugins_list.tpl @@ -30,42 +30,42 @@ {if $plugin.STATE == 'active'} <li> <a href="{$plugin.U_ACTION}&action=deactivate"> - <img src="{$themeconf.admin_icon_dir}/plug_deactivate.png" alt="{'Deactivate'|@translate}" title="{'Deactivate'|@translate}" /> + <img src="{$themeconf.admin_icon_dir}/plug_deactivate.png" alt="{'Deactivate'|@translate}" title="{'Deactivate'|@translate}"> </a> </li> <li> - <img src="{$themeconf.admin_icon_dir}/plug_uninstall_grey.png" alt="{'Uninstall'|@translate}" title="{'Uninstall'|@translate}" /> + <img src="{$themeconf.admin_icon_dir}/plug_uninstall_grey.png" alt="{'Uninstall'|@translate}" title="{'Uninstall'|@translate}"> </li> {/if} {if $plugin.STATE == 'inactive'} <li> <a href="{$plugin.U_ACTION}&action=activate"> - <img src="{$themeconf.admin_icon_dir}/plug_activate.png" alt="{'Activate'|@translate}" title="{'Activate'|@translate}" /> + <img src="{$themeconf.admin_icon_dir}/plug_activate.png" alt="{'Activate'|@translate}" title="{'Activate'|@translate}"> </a> </li> <li> <a href="{$plugin.U_ACTION}&action=uninstall" onclick="return confirm('{'Are you sure?'|@translate|@escape:'javascript'}');"> - <img src="{$themeconf.admin_icon_dir}/plug_uninstall.png" alt="{'Uninstall'|@translate}" title="{'Uninstall'|@translate}" /> + <img src="{$themeconf.admin_icon_dir}/plug_uninstall.png" alt="{'Uninstall'|@translate}" title="{'Uninstall'|@translate}"> </a> </li> {/if} {if $plugin.STATE == 'missing'} <li> - <img src="{$themeconf.admin_icon_dir}/plug_deactivate_grey.png" alt="{'Deactivate'|@translate}" title="{'Deactivate'|@translate}" /> + <img src="{$themeconf.admin_icon_dir}/plug_deactivate_grey.png" alt="{'Deactivate'|@translate}" title="{'Deactivate'|@translate}"> </li> <li> <a href="{$plugin.U_ACTION}&action=uninstall" onclick="return confirm('{'Are you sure?'|@translate|@escape:'javascript'}');"> - <img src="{$themeconf.admin_icon_dir}/plug_uninstall.png" alt="{'Uninstall'|@translate}" title="{'Uninstall'|@translate}" /> + <img src="{$themeconf.admin_icon_dir}/plug_uninstall.png" alt="{'Uninstall'|@translate}" title="{'Uninstall'|@translate}"> </a> </li> {/if} {if $plugin.STATE == 'uninstalled'} <li> - <img src="{$themeconf.admin_icon_dir}/plug_activate_grey.png" alt="{'Activate'|@translate}" title="{'Activate'|@translate}" /> + <img src="{$themeconf.admin_icon_dir}/plug_activate_grey.png" alt="{'Activate'|@translate}" title="{'Activate'|@translate}"> </li> <li> <a href="{$plugin.U_ACTION}&action=install" onclick="return confirm('{'Are you sure?'|@translate|@escape:'javascript'}');"> - <img src="{$themeconf.admin_icon_dir}/plug_install.png" alt="{'Install'|@translate}" title="{'Install'|@translate}"/> + <img src="{$themeconf.admin_icon_dir}/plug_install.png" alt="{'Install'|@translate}" title="{'Install'|@translate}"> </a> </li> <li> @@ -75,7 +75,7 @@ </li> {else} <li> - <img src="{$themeconf.admin_icon_dir}/plug_delete_grey.png" alt="{'plugins_delete'|@translate}" title="{'plugins_delete'|@translate}" /> + <img src="{$themeconf.admin_icon_dir}/plug_delete_grey.png" alt="{'plugins_delete'|@translate}" title="{'plugins_delete'|@translate}"> </li> {/if} </ul> diff --git a/admin/template/goto/profile_content.tpl b/admin/template/goto/profile_content.tpl index dc67d5032..e4191f099 100644 --- a/admin/template/goto/profile_content.tpl +++ b/admin/template/goto/profile_content.tpl @@ -3,7 +3,7 @@ <fieldset> <legend>{'Registration'|@translate}</legend> - <input type="hidden" name="redirect" value="{$REDIRECT}" /> + <input type="hidden" name="redirect" value="{$REDIRECT}"> <ul> <li> <span class="property">{'Username'|@translate}</span> diff --git a/admin/template/goto/rating.tpl b/admin/template/goto/rating.tpl index cfad377c5..e53512ab2 100644 --- a/admin/template/goto/rating.tpl +++ b/admin/template/goto/rating.tpl @@ -26,9 +26,9 @@ <label> - <input class="submit" type="submit" name="submit_filter" value="{'Submit'|@translate}" /> + <input class="submit" type="submit" name="submit_filter" value="{'Submit'|@translate}"> </label> - <input type="hidden" name="page" value="rating" /> + <input type="hidden" name="page" value="rating"> </fieldset> </form> @@ -59,7 +59,7 @@ <td>{$rate.RATE}</td> <td><b>{$rate.USER}</b></td> <td><span class="date">{$rate.DATE}</span></td> - <td><a href="{$rate.U_DELETE}" {$TAG_INPUT_ENABLED}><img src="{$themeconf.admin_icon_dir}/delete.png" class="button" style="border:none;vertical-align:middle; margin-left:5px;" alt="[{'delete'|@translate}]"/></a></td> + <td><a href="{$rate.U_DELETE}" {$TAG_INPUT_ENABLED}><img src="{$themeconf.admin_icon_dir}/delete.png" class="button" style="border:none;vertical-align:middle; margin-left:5px;" alt="[{'delete'|@translate}]"></a></td> </tr> {/foreach} {*rates*} {/foreach} {*images*} diff --git a/admin/template/goto/site_manager.tpl b/admin/template/goto/site_manager.tpl index 61c0157cf..c1e86cae6 100644 --- a/admin/template/goto/site_manager.tpl +++ b/admin/template/goto/site_manager.tpl @@ -19,15 +19,15 @@ <form action="{$F_ACTION}" method="post"> <p> {'remote_site_local_create'|@translate}: - <input type="hidden" name="no_check" value="1"/> - <input type="hidden" name="galleries_url" value="{$local_listing.URL}" /> - <input type="submit" name="submit" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED} /> + <input type="hidden" name="no_check" value="1"> + <input type="hidden" name="galleries_url" value="{$local_listing.URL}"> + <input type="submit" name="submit" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}> </p> </form> {/if} {if isset($local_listing.U_SYNCHRONIZE)} <a href="{$local_listing.U_SYNCHRONIZE}" title="{'remote_site_local_update'|@translate}">{'site_synchronize'|@translate}</a> -<br/><br/> +<br><br> {/if} {/if} @@ -39,7 +39,7 @@ </tr> {foreach from=$sites item=site name=site} <tr style="text-align:left" class="{if $smarty.foreach.site.index is odd}row1{else}row2{/if}"><td> - <a href="{$site.NAME}">{$site.NAME}</a><br/>({$site.TYPE}, {$site.CATEGORIES} {'Categories'|@translate}, {$pwg->l10n_dec('%d element','%d elements',$site.IMAGES)}) + <a href="{$site.NAME}">{$site.NAME}</a><br>({$site.TYPE}, {$site.CATEGORIES} {'Categories'|@translate}, {$pwg->l10n_dec('%d element','%d elements',$site.IMAGES)}) </td><td> [<a href="{$site.U_SYNCHRONIZE}" title="{'site_synchronize_hint'|@translate}">{'site_synchronize'|@translate}</a>] {if isset($site.U_DELETE)} @@ -47,7 +47,7 @@ title="{'site_delete_hint'|@translate}" {$TAG_INPUT_ENABLED}>{'site_delete'|@translate}</a>] {/if} {if isset($site.remote)} - <br/> + <br> [<a href="{$site.remote.U_TEST}" title="{'remote_site_test_hint'|@translate}" {$TAG_INPUT_ENABLED}>{'remote_site_test'|@translate}</a>] [<a href="{$site.remote.U_GENERATE}" title="{'remote_site_generate_hint'|@translate}" {$TAG_INPUT_ENABLED}>{'remote_site_generate'|@translate}</a>] [<a href="{$site.remote.U_CLEAN}" title="{'remote_site_clean_hint'|@translate}" {$TAG_INPUT_ENABLED}>{'remote_site_clean'|@translate}</a>] @@ -66,9 +66,9 @@ <form action="{$F_ACTION}" method="post"> <p> <label for="galleries_url" >{'site_create'|@translate}</label> - <input type="text" name="galleries_url" id="galleries_url" /> + <input type="text" name="galleries_url" id="galleries_url"> </p> <p> - <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED} /> + <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}> </p> </form> diff --git a/admin/template/goto/site_update.tpl b/admin/template/goto/site_update.tpl index 861c154d9..7b48094b9 100644 --- a/admin/template/goto/site_update.tpl +++ b/admin/template/goto/site_update.tpl @@ -63,13 +63,13 @@ <fieldset id="syncFiles"> <legend>{'update_sync_files'|@translate}</legend> <ul> - <li><label><input type="radio" name="sync" value="" {if empty($introduction.sync)}checked="checked"{/if}/> {'nothing'|@translate}</label></li> - <li><label><input type="radio" name="sync" value="dirs" {if 'dirs'==$introduction.sync}checked="checked"{/if}/> {'update_sync_dirs'|@translate}</label></li> + <li><label><input type="radio" name="sync" value="" {if empty($introduction.sync)}checked="checked"{/if}> {'nothing'|@translate}</label></li> + <li><label><input type="radio" name="sync" value="dirs" {if 'dirs'==$introduction.sync}checked="checked"{/if}> {'update_sync_dirs'|@translate}</label></li> - <li><label><input type="radio" name="sync" value="files" {if 'files'==$introduction.sync}checked="checked"{/if}/> {'update_sync_all'|@translate}</label> + <li><label><input type="radio" name="sync" value="files" {if 'files'==$introduction.sync}checked="checked"{/if}> {'update_sync_all'|@translate}</label> <ul style="padding-left:3em"> - <li><label><input type="checkbox" name="display_info" value="1" {if $introduction.display_info}checked="checked"{/if}/> {'update_display_info'|@translate}</label></li> - <li><label><input type="checkbox" name="add_to_caddie" value="1" {if $introduction.add_to_caddie}checked="checked"{/if}/> {'add new elements to caddie'|@translate}</label></li> + <li><label><input type="checkbox" name="display_info" value="1" {if $introduction.display_info}checked="checked"{/if}> {'update_display_info'|@translate}</label></li> + <li><label><input type="checkbox" name="add_to_caddie" value="1" {if $introduction.add_to_caddie}checked="checked"{/if}> {'add new elements to caddie'|@translate}</label></li> <li><label>{'Minimum privacy level'|@translate} <select name="privacy_level">{html_options options=$introduction.privacy_level_options selected=$introduction.privacy_level_selected}</select></label></li> </ul> </li> @@ -78,20 +78,20 @@ <fieldset id="syncMetadata"> <legend>{'update_sync_metadata'|@translate}</legend> - <label><input type="checkbox" name="sync_meta" {if $introduction.sync_meta}checked="checked"{/if}/> {'synchronize metadata'|@translate} ({$METADATA_LIST})</label></li> + <label><input type="checkbox" name="sync_meta" {if $introduction.sync_meta}checked="checked"{/if}> {'synchronize metadata'|@translate} ({$METADATA_LIST})</label></li> <ul style="padding-left:3em"> <li> - <label><input type="checkbox" name="meta_all" {if $introduction.meta_all}checked="checked"{/if}/> {'update_sync_metadata_all'|@translate}</label> + <label><input type="checkbox" name="meta_all" {if $introduction.meta_all}checked="checked"{/if}> {'update_sync_metadata_all'|@translate}</label> </li> <li> - <label><input type="checkbox" name="meta_empty_overrides" {if $introduction.meta_empty_overrides}checked="checked"{/if}/> {'overrides existing values with empty ones'|@translate}</label> + <label><input type="checkbox" name="meta_empty_overrides" {if $introduction.meta_empty_overrides}checked="checked"{/if}> {'overrides existing values with empty ones'|@translate}</label> </li> </ul> </fieldset> <fieldset id="syncSimulate"> <legend></legend> - <ul><li><label><input type="checkbox" name="simulate" value="1" checked="checked" {$TAG_INPUT_ENABLED} /> {'update_simulate'|@translate}</label></li></ul> + <ul><li><label><input type="checkbox" name="simulate" value="1" checked="checked" {$TAG_INPUT_ENABLED}> {'update_simulate'|@translate}</label></li></ul> </fieldset> <fieldset id="catSubset"> @@ -103,13 +103,13 @@ </select> </li> - <li><label><input type="checkbox" name="subcats-included" value="1" {if $introduction.subcats_included}checked="checked"{/if}/> {'search_subcats_included'|@translate}</label></li> + <li><label><input type="checkbox" name="subcats-included" value="1" {if $introduction.subcats_included}checked="checked"{/if}> {'search_subcats_included'|@translate}</label></li> </ul> </fieldset> <p class="bottomButtons"> - <input class="submit" type="submit" value="{'Submit'|@translate}" name="submit" /> - <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset" /> + <input class="submit" type="submit" value="{'Submit'|@translate}" name="submit"> + <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset"> </p> </form> {/if}{*isset $introduction*} diff --git a/admin/template/goto/tags.tpl b/admin/template/goto/tags.tpl index b2ce57341..1072ea6e2 100644 --- a/admin/template/goto/tags.tpl +++ b/admin/template/goto/tags.tpl @@ -8,7 +8,7 @@ {if isset($EDIT_TAGS_LIST)} <fieldset> <legend>{'Edit tags'|@translate}</legend> - <input type="hidden" name="edit_list" value="{$EDIT_TAGS_LIST}" /> + <input type="hidden" name="edit_list" value="{$EDIT_TAGS_LIST}"> <table class="table2"> <tr class="throw"> <th>{'Current name'|@translate}</th> @@ -17,14 +17,14 @@ {foreach from=$tags item=tag} <tr> <td>{$tag.NAME}</td> - <td><input type="text" name="tag_name-{$tag.ID}" value="{$tag.NAME}" /></td> + <td><input type="text" name="tag_name-{$tag.ID}" value="{$tag.NAME}"></td> </tr> {/foreach} </table> <p> - <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED} /> - <input class="submit" type="reset" value="{'Reset'|@translate}" /> + <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}> + <input class="submit" type="reset" value="{'Reset'|@translate}"> </p> </fieldset> {/if} @@ -34,10 +34,10 @@ <label> {'New tag'|@translate} - <input type="text" name="add_tag" /> + <input type="text" name="add_tag"> </label> - <p><input class="submit" type="submit" name="add" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}/></p> + <p><input class="submit" type="submit" name="add" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}></p> </fieldset> <fieldset> @@ -46,8 +46,8 @@ {$TAG_SELECTION} <p> - <input class="submit" type="submit" name="edit" value="{'Edit selected tags'|@translate}"/> - <input class="submit" type="submit" name="delete" value="{'Delete selected tags'|@translate}" onclick="return confirm('{'Are you sure?'|@translate}');" {$TAG_INPUT_ENABLED}/> + <input class="submit" type="submit" name="edit" value="{'Edit selected tags'|@translate}"> + <input class="submit" type="submit" name="delete" value="{'Delete selected tags'|@translate}" onclick="return confirm('{'Are you sure?'|@translate}');" {$TAG_INPUT_ENABLED}> </p> </fieldset> diff --git a/admin/template/goto/thumbnail.tpl b/admin/template/goto/thumbnail.tpl index d753e0175..b38692d42 100644 --- a/admin/template/goto/thumbnail.tpl +++ b/admin/template/goto/thumbnail.tpl @@ -16,7 +16,7 @@ {foreach from=$results.elements item=elt} <tr> <td>{$elt.PATH}</td> - <td><img src="{$elt.TN_FILE_IMG}" /></td> + <td><img src="{$elt.TN_FILE_IMG}"></td> <td style="text-align:right;">{$elt.GEN_TIME}</td> <td style="text-align:right;">{$elt.TN_FILESIZE_IMG}</td> <td style="text-align:right;">{$elt.TN_WIDTH_IMG} x {$elt.TN_HEIGHT_IMG}</td> @@ -49,7 +49,7 @@ <td style="text-align:right;">{$results.TN_AVERAGE}</td> </tr> </table> -<br /> +<br> {/if} {if isset($params) } @@ -62,10 +62,10 @@ <li> <span class="property">{'tn_params_GD'|@translate}</span> <label> - <input type="radio" name="gd" value="2" {if $params.GD_SELECTED==2}checked="checked"{/if} />2.x + <input type="radio" name="gd" value="2" {if $params.GD_SELECTED==2}checked="checked"{/if}>2.x </label> <label> - <input type="radio" name="gd" value="1" {if $params.GD_SELECTED==1}checked="checked"{/if} />1.x + <input type="radio" name="gd" value="1" {if $params.GD_SELECTED==1}checked="checked"{/if}>1.x </label> </li> @@ -73,27 +73,27 @@ <span class="property"> <label for="width">{'maximum width'|@translate}</label> </span> - <input type="text" id="width" name="width" value="{$params.WIDTH_TN}" /> + <input type="text" id="width" name="width" value="{$params.WIDTH_TN}"> </li> <li> <span class="property"> <label for="height">{'maximum height'|@translate}</label> </span> - <input type="text" id="height" name="height" value="{$params.HEIGHT_TN}" /> + <input type="text" id="height" name="height" value="{$params.HEIGHT_TN}"> </li> <li> <span class="property">{'Number of thumbnails to create'|@translate}</span> - <label><input type="radio" name="n" value="5" {if $params.N_SELECTED==5}checked="checked"{/if} /> 5</label> - <label><input type="radio" name="n" value="10" {if $params.N_SELECTED==10}checked="checked"{/if} /> 10</label> - <label><input type="radio" name="n" value="20" {if $params.N_SELECTED==20}checked="checked"{/if} /> 20</label> - <label><input type="radio" name="n" value="all" {if $params.N_SELECTED=='all'}checked="checked"{/if} /> {'tn_all'|@translate}</label> + <label><input type="radio" name="n" value="5" {if $params.N_SELECTED==5}checked="checked"{/if}> 5</label> + <label><input type="radio" name="n" value="10" {if $params.N_SELECTED==10}checked="checked"{/if}> 10</label> + <label><input type="radio" name="n" value="20" {if $params.N_SELECTED==20}checked="checked"{/if}> 20</label> + <label><input type="radio" name="n" value="all" {if $params.N_SELECTED=='all'}checked="checked"{/if}> {'tn_all'|@translate}</label> </li> </ul> </fieldset> - <p><input class="submit" type="submit" name="submit" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}/></p> + <p><input class="submit" type="submit" name="submit" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}></p> </form> {/if} {*isset params*} diff --git a/admin/template/goto/upgrade.tpl b/admin/template/goto/upgrade.tpl index b23448223..00cc297cf 100644 --- a/admin/template/goto/upgrade.tpl +++ b/admin/template/goto/upgrade.tpl @@ -68,17 +68,17 @@ textarea { margin-left: 20px; } <table> <tr> <td>{'Username'|@translate}</td> - <td><input type="text" name="username" id="username" size="25" maxlength="40" style="width: 150px;" /></td> + <td><input type="text" name="username" id="username" size="25" maxlength="40" style="width: 150px;"></td> </tr> <tr> <td>{'Password'|@translate}</td> - <td><input type="password" name="password" id="password" size="25" maxlength="25" style="width: 150px;" /></td> + <td><input type="password" name="password" id="password" size="25" maxlength="25" style="width: 150px;"></td> </tr> </table> {/if} <p style="text-align: center;"> -<input class="submit" type="submit" name="submit" value="{'Upgrade from %s to %s'|@translate|@sprintf:$introduction.CURRENT_RELEASE:$RELEASE}"/> +<input class="submit" type="submit" name="submit" value="{'Upgrade from %s to %s'|@translate|@sprintf:$introduction.CURRENT_RELEASE:$RELEASE}"> </p> </form> <!-- @@ -107,7 +107,7 @@ textarea { margin-left: 20px; } </ul> <form action="index.php" method="post"> -<p><input type="submit" name="submit" value="{'home'|@translate}"/></p> +<p><input type="submit" name="submit" value="{'home'|@translate}"></p> </form> {/if} diff --git a/admin/template/goto/upload.tpl b/admin/template/goto/upload.tpl index 098a92fe3..7a3e559ea 100644 --- a/admin/template/goto/upload.tpl +++ b/admin/template/goto/upload.tpl @@ -33,8 +33,8 @@ <a href="mailto:{$picture.UPLOAD_EMAIL}">{$picture.UPLOAD_USERNAME}</a> </td> <td style="white-space:nowrap;"> - <label><input type="radio" name="action-{$picture.ID_IMG}" value="validate" /> {'Validate'|@translate}</label> - <label><input type="radio" name="action-{$picture.ID_IMG}" value="reject" /> {'Reject'|@translate}</label> + <label><input type="radio" name="action-{$picture.ID_IMG}" value="validate"> {'Validate'|@translate}</label> + <label><input type="radio" name="action-{$picture.ID_IMG}" value="reject"> {'Reject'|@translate}</label> </td> </tr> {/foreach} @@ -42,11 +42,11 @@ </table> <p class="bottomButtons"> - <input type="hidden" name="list" value="{$LIST}" /> - <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}/> - <input class="submit" type="submit" name="validate-all" value="{'Validate All'|@translate}" {$TAG_INPUT_ENABLED}/> - <input class="submit" type="submit" name="reject-all" value="{'Reject All'|@translate}" {$TAG_INPUT_ENABLED}/> - <input class="submit" type="reset" value="{'Reset'|@translate}" /> + <input type="hidden" name="list" value="{$LIST}"> + <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}> + <input class="submit" type="submit" name="validate-all" value="{'Validate All'|@translate}" {$TAG_INPUT_ENABLED}> + <input class="submit" type="submit" name="reject-all" value="{'Reject All'|@translate}" {$TAG_INPUT_ENABLED}> + <input class="submit" type="reset" value="{'Reset'|@translate}"> </p> </form> diff --git a/admin/template/goto/user_list.tpl b/admin/template/goto/user_list.tpl index 06e1a9062..50161d9d5 100644 --- a/admin/template/goto/user_list.tpl +++ b/admin/template/goto/user_list.tpl @@ -6,19 +6,19 @@ <form class="filter" method="post" name="add_user" action="{$F_ADD_ACTION}"> <fieldset> <legend>{'Add a user'|@translate}</legend> - <label>{'Username'|@translate} <input type="text" name="login" maxlength="50" size="20" /></label> - <label>{'Password'|@translate} <input type="text" name="password" /></label> - <label>{'Email address'|@translate} <input type="text" name="email" /></label> - <label> <input class="submit" type="submit" name="submit_add" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED} /></label> + <label>{'Username'|@translate} <input type="text" name="login" maxlength="50" size="20"></label> + <label>{'Password'|@translate} <input type="text" name="password"></label> + <label>{'Email address'|@translate} <input type="text" name="email"></label> + <label> <input class="submit" type="submit" name="submit_add" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}></label> </fieldset> </form> <form class="filter" method="get" name="filter" action="{$F_FILTER_ACTION}"> <fieldset> <legend>{'Filter'|@translate}</legend> - <input type="hidden" name="page" value="user_list" /> + <input type="hidden" name="page" value="user_list"> - <label>{'Username'|@translate} <input type="text" name="username" value="{$F_USERNAME}" /></label> + <label>{'Username'|@translate} <input type="text" name="username" value="{$F_USERNAME}"></label> <label> {'status'|@translate} @@ -42,7 +42,7 @@ <label> - <input class="submit" type="submit" value="{'Submit'|@translate}" /> + <input class="submit" type="submit" value="{'Submit'|@translate}"> </label> </fieldset> @@ -71,7 +71,7 @@ {foreach from=$users item=user name=users_loop} <tr class="{if $smarty.foreach.users_loop.index is odd}row1{else}row2{/if}"> - <td><input type="checkbox" name="selection[]" value="{$user.ID}" {$user.CHECKED} id="selection-{$user.ID}" /></td> + <td><input type="checkbox" name="selection[]" value="{$user.ID}" {$user.CHECKED} id="selection-{$user.ID}"></td> <td><label for="selection-{$user.ID}">{$user.USERNAME}</label></td> <td>{$user.STATUS}</td> <td>{$user.EMAIL}</td> @@ -81,8 +81,8 @@ <td>{$data}</td> {/foreach} <td style="text-align:center;"> - <a href="{$user.U_PERM}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/permissions.png" class="button" style="border:none" alt="{'permissions'|@translate}" title="{'permissions'|@translate}" /></a> - <a href="{$user.U_PROFILE}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/edit_s.png" class="button" style="border:none" alt="{'Profile'|@translate}" title="{'Profile'|@translate}" /></a> + <a href="{$user.U_PERM}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/permissions.png" class="button" style="border:none" alt="{'permissions'|@translate}" title="{'permissions'|@translate}"></a> + <a href="{$user.U_PROFILE}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/edit_s.png" class="button" style="border:none" alt="{'Profile'|@translate}" title="{'Profile'|@translate}"></a> {foreach from=$user.plugin_actions item=data} {$data} {/foreach} @@ -96,8 +96,8 @@ {* delete the selected users ? *} <fieldset> <legend>{'Deletions'|@translate}</legend> - <label><input type="checkbox" name="confirm_deletion" value="1" /> {'confirm'|@translate}</label> - <input class="submit" type="submit" value="{'Delete selected users'|@translate}" name="delete" {$TAG_INPUT_ENABLED}/> + <label><input type="checkbox" name="confirm_deletion" value="1"> {'confirm'|@translate}</label> + <input class="submit" type="submit" value="{'Delete selected users'|@translate}" name="delete" {$TAG_INPUT_ENABLED}> </fieldset> <fieldset> @@ -107,8 +107,8 @@ <tr> <td>{'Status'|@translate}</td> <td> - <label><input type="radio" name="status_action" value="leave" checked="checked" /> {'leave'|@translate}</label> - <label><input type="radio" name="status_action" value="set" id="status_action_set" /> {'set to'|@translate}</label> + <label><input type="radio" name="status_action" value="leave" checked="checked"> {'leave'|@translate}</label> + <label><input type="radio" name="status_action" value="set" id="status_action_set"> {'set to'|@translate}</label> <select onchange="document.getElementById('status_action_set').checked = true;" name="status" size="1"> {html_options options=$pref_status_options selected=$pref_status_selected} </select> @@ -119,10 +119,10 @@ <tr> <td>{'adviser'|@translate}</td> <td> - <label><input type="radio" name="adviser" value="leave" checked="checked" /> {'leave'|@translate}</label> + <label><input type="radio" name="adviser" value="leave" checked="checked"> {'leave'|@translate}</label> / {'set to'|@translate} - <label><input type="radio" name="adviser" value="true" />{'Yes'|@translate}</label> - <label><input type="radio" name="adviser" value="false" />{'No'|@translate}</label> + <label><input type="radio" name="adviser" value="true">{'Yes'|@translate}</label> + <label><input type="radio" name="adviser" value="false">{'No'|@translate}</label> </td> </tr> {/if} @@ -163,18 +163,18 @@ <tr> <td>{'enabled_high'|@translate}</td> <td> - <label><input type="radio" name="enabled_high" value="leave" checked="checked" /> {'leave'|@translate}</label> + <label><input type="radio" name="enabled_high" value="leave" checked="checked"> {'leave'|@translate}</label> / {'set to'|@translate} - <label><input type="radio" name="enabled_high" value="true" />{'Yes'|@translate}</label> - <label><input type="radio" name="enabled_high" value="false" />{'No'|@translate}</label> + <label><input type="radio" name="enabled_high" value="true">{'Yes'|@translate}</label> + <label><input type="radio" name="enabled_high" value="false">{'No'|@translate}</label> </td> </tr> <tr> <td>{'Privacy level'|@translate}</td> <td> - <label><input type="radio" name="level_action" value="leave" checked="checked" />{'leave'|@translate}</label> - <label><input type="radio" name="level_action" value="set" id="level_action_set" />{'set to'|@translate}</label> + <label><input type="radio" name="level_action" value="leave" checked="checked">{'leave'|@translate}</label> + <label><input type="radio" name="level_action" value="set" id="level_action_set">{'set to'|@translate}</label> <select onchange="document.getElementById('level_action_set').checked = true;" name="level" size="1"> {html_options options=$level_options selected=$level_selected} </select> @@ -194,28 +194,28 @@ <tr> <td>{'nb_image_per_row'|@translate}</td> <td> - <label><input type="radio" name="nb_image_line_action" value="leave" checked="checked" /> {'leave'|@translate}</label> - <label><input type="radio" name="nb_image_line_action" value="set" id="nb_image_line_action_set" /> {'set to'|@translate}</label> + <label><input type="radio" name="nb_image_line_action" value="leave" checked="checked"> {'leave'|@translate}</label> + <label><input type="radio" name="nb_image_line_action" value="set" id="nb_image_line_action_set"> {'set to'|@translate}</label> <input onmousedown="document.getElementById('nb_image_line_action_set').checked = true;" - size="3" maxlength="2" type="text" name="nb_image_line" value="{$NB_IMAGE_LINE}" /> + size="3" maxlength="2" type="text" name="nb_image_line" value="{$NB_IMAGE_LINE}"> </td> </tr> <tr> <td>{'nb_row_per_page'|@translate}</td> <td> - <label><input type="radio" name="nb_line_page_action" value="leave" checked="checked" /> {'leave'|@translate}</label> - <label><input type="radio" name="nb_line_page_action" value="set" id="nb_line_page_action_set" /> {'set to'|@translate}</label> + <label><input type="radio" name="nb_line_page_action" value="leave" checked="checked"> {'leave'|@translate}</label> + <label><input type="radio" name="nb_line_page_action" value="set" id="nb_line_page_action_set"> {'set to'|@translate}</label> <input onmousedown="document.getElementById('nb_line_page_action_set').checked = true;" - size="3" maxlength="2" type="text" name="nb_line_page" value="{$NB_LINE_PAGE}" /> + size="3" maxlength="2" type="text" name="nb_line_page" value="{$NB_LINE_PAGE}"> <td> </tr> <tr> <td>{'theme'|@translate}</td> <td> - <label><input type="radio" name="template_action" value="leave" checked="checked" /> {'leave'|@translate}</label> - <label><input type="radio" name="template_action" value="set" id="template_action_set" /> {'set to'|@translate}</label> + <label><input type="radio" name="template_action" value="leave" checked="checked"> {'leave'|@translate}</label> + <label><input type="radio" name="template_action" value="set" id="template_action_set"> {'set to'|@translate}</label> <select onchange="document.getElementById('template_action_set').checked = true;" name="template" size="1"> {html_options values=$template_options output=$template_options selected=$template_selected} </select> @@ -225,8 +225,8 @@ <tr> <td>{'language'|@translate}</td> <td> - <label><input type="radio" name="language_action" value="leave" checked="checked" /> {'leave'|@translate}</label> - <label><input type="radio" name="language_action" value="set" id="language_action_set" /> {'set to'|@translate}</label> + <label><input type="radio" name="language_action" value="leave" checked="checked"> {'leave'|@translate}</label> + <label><input type="radio" name="language_action" value="set" id="language_action_set"> {'set to'|@translate}</label> <select onchange="document.getElementById('language_action_set').checked = true;" name="language" size="1"> {html_options options=$language_options selected=$language_selected} </select> @@ -236,51 +236,51 @@ <tr> <td>{'recent_period'|@translate}</td> <td> - <label><input type="radio" name="recent_period_action" value="leave" checked="checked" /> {'leave'|@translate}</label> - <label><input type="radio" name="recent_period_action" value="set" id="recent_period_action_set" /> {'set to'|@translate}</label> + <label><input type="radio" name="recent_period_action" value="leave" checked="checked"> {'leave'|@translate}</label> + <label><input type="radio" name="recent_period_action" value="set" id="recent_period_action_set"> {'set to'|@translate}</label> <input onmousedown="document.getElementById('recent_period_action_set').checked = true;" - type="text" size="3" maxlength="2" name="recent_period" value="{$RECENT_PERIOD}" /> + type="text" size="3" maxlength="2" name="recent_period" value="{$RECENT_PERIOD}"> </td> </tr> <tr> <td>{'auto_expand'|@translate}</td> <td> - <label><input type="radio" name="expand" value="leave" checked="checked" /> {'leave'|@translate}</label> + <label><input type="radio" name="expand" value="leave" checked="checked"> {'leave'|@translate}</label> / {'set to'|@translate} - <label><input type="radio" name="expand" value="true" />{'Yes'|@translate}</label> - <label><input type="radio" name="expand" value="false" />{'No'|@translate}</label> + <label><input type="radio" name="expand" value="true">{'Yes'|@translate}</label> + <label><input type="radio" name="expand" value="false">{'No'|@translate}</label> </td> </tr> <tr> <td>{'show_nb_comments'|@translate}</td> <td> - <label><input type="radio" name="show_nb_comments" value="leave" checked="checked" /> {'leave'|@translate}</label> + <label><input type="radio" name="show_nb_comments" value="leave" checked="checked"> {'leave'|@translate}</label> / {'set to'|@translate} - <label><input type="radio" name="show_nb_comments" value="true" />{'Yes'|@translate}</label> - <label><input type="radio" name="show_nb_comments" value="false" />{'No'|@translate}</label> + <label><input type="radio" name="show_nb_comments" value="true">{'Yes'|@translate}</label> + <label><input type="radio" name="show_nb_comments" value="false">{'No'|@translate}</label> </td> </tr> <tr> <td>{'show_nb_hits'|@translate}</td> <td> - <label><input type="radio" name="show_nb_hits" value="leave" checked="checked" /> {'leave'|@translate}</label> + <label><input type="radio" name="show_nb_hits" value="leave" checked="checked"> {'leave'|@translate}</label> / {'set to'|@translate} - <label><input type="radio" name="show_nb_hits" value="true" />{'Yes'|@translate}</label> - <label><input type="radio" name="show_nb_hits" value="false" />{'No'|@translate}</label> + <label><input type="radio" name="show_nb_hits" value="true">{'Yes'|@translate}</label> + <label><input type="radio" name="show_nb_hits" value="false">{'No'|@translate}</label> </td> </tr> <tr> <td>{'maxwidth'|@translate}</td> <td> - <label><input type="radio" name="maxwidth_action" value="leave" checked="checked" /> {'leave'|@translate}</label> - <label><input type="radio" name="maxwidth_action" value="unset" /> {'unset'|@translate}</label> - <label><input type="radio" name="maxwidth_action" value="set" id="maxwidth_action_set" /> {'set to'|@translate}</label> + <label><input type="radio" name="maxwidth_action" value="leave" checked="checked"> {'leave'|@translate}</label> + <label><input type="radio" name="maxwidth_action" value="unset"> {'unset'|@translate}</label> + <label><input type="radio" name="maxwidth_action" value="set" id="maxwidth_action_set"> {'set to'|@translate}</label> <input onmousedown="document.getElementById('maxwidth_action_set').checked = true;" - type="text" size="4" maxlength="4" name="maxwidth" value="{$MAXWIDTH}" /> + type="text" size="4" maxlength="4" name="maxwidth" value="{$MAXWIDTH}"> </td> </tr> @@ -288,11 +288,11 @@ <tr> <td>{'maxheight'|@translate}</td> <td> - <label><input type="radio" name="maxheight_action" value="leave" checked="checked" /> {'leave'|@translate}</label> - <label><input type="radio" name="maxheight_action" value="unset" /> {'unset'|@translate}</label> - <label><input type="radio" name="maxheight_action" value="set" id="maxheight_action_set" /> {'set to'|@translate}</label> + <label><input type="radio" name="maxheight_action" value="leave" checked="checked"> {'leave'|@translate}</label> + <label><input type="radio" name="maxheight_action" value="unset"> {'unset'|@translate}</label> + <label><input type="radio" name="maxheight_action" value="set" id="maxheight_action_set"> {'set to'|@translate}</label> <input onmousedown="document.getElementById('maxheight_action_set').checked = true;" - type="text" size="4" maxlength="4" name="maxheight" value="{$MAXHEIGHT}" /> + type="text" size="4" maxlength="4" name="maxheight" value="{$MAXHEIGHT}"> </td> </tr> @@ -303,13 +303,13 @@ <p> {'target'|@translate} - <label><input type="radio" name="target" value="all" /> {'all'|@translate}</label> - <label><input type="radio" name="target" value="selection" checked="checked" /> {'selection'|@translate}</label> + <label><input type="radio" name="target" value="all"> {'all'|@translate}</label> + <label><input type="radio" name="target" value="selection" checked="checked"> {'selection'|@translate}</label> </p> <p> - <input class="submit" type="submit" value="{'Submit'|@translate}" name="pref_submit" {$TAG_INPUT_ENABLED} /> - <input class="submit" type="reset" value="{'Reset'|@translate}" name="pref_reset" /> + <input class="submit" type="submit" value="{'Submit'|@translate}" name="pref_submit" {$TAG_INPUT_ENABLED}> + <input class="submit" type="reset" value="{'Reset'|@translate}" name="pref_reset"> </p> </form> diff --git a/admin/user_list.php b/admin/user_list.php index abfc94742..0461c83ba 100644 --- a/admin/user_list.php +++ b/admin/user_list.php @@ -658,12 +658,12 @@ foreach ($visible_user_list as $local_user) 'U_PERM' => $perm_url.$local_user['id'], 'USERNAME' => $local_user['username'] .($local_user['id'] == $conf['guest_id'] - ? '<BR />['.l10n('is_the_guest').']' : '') + ? '<br>['.l10n('is_the_guest').']' : '') .($local_user['id'] == $conf['default_user_id'] - ? '<BR />['.l10n('is_the_default').']' : ''), + ? '<br>['.l10n('is_the_default').']' : ''), 'STATUS' => l10n('user_status_'. $local_user['status']).(($local_user['adviser'] == 'true') - ? '<BR />['.l10n('adviser').']' : ''), + ? '<br>['.l10n('adviser').']' : ''), 'EMAIL' => get_email_address_as_display_text($local_user['email']), 'GROUPS' => $groups_string, 'PROPERTIES' => implode( ', ', $properties), @@ -180,7 +180,7 @@ foreach($dates as $date_detail) ); $item->description .= - '<a href="'.make_index_url().'">'.$conf['gallery_title'].'</a><br/> '; + '<a href="'.make_index_url().'">'.$conf['gallery_title'].'</a><br> '; $item->description .= get_html_description_recent_post_date($date_detail); diff --git a/include/category_cats.inc.php b/include/category_cats.inc.php index b923ec569..635b5efed 100644 --- a/include/category_cats.inc.php +++ b/include/category_cats.inc.php @@ -257,7 +257,7 @@ if (count($categories) > 0) $category['count_images'], $category['count_categories'], true, - '<br />' + '<br>' ), 'DESCRIPTION' => trigger_event('render_category_literal_description', diff --git a/include/feedcreator.class.php b/include/feedcreator.class.php index f274b8417..62ba6c06b 100644 --- a/include/feedcreator.class.php +++ b/include/feedcreator.class.php @@ -689,7 +689,7 @@ class FeedCreator extends HtmlDescribable { $this->_redirect($filename); } } else { - echo "<br /><b>Error creating feed file, please check write permissions.</b><br />"; + echo "<br><b>Error creating feed file, please check write permissions.</b><br>"; } } diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php index 45e5e04eb..4dac9cb88 100644 --- a/include/functions_html.inc.php +++ b/include/functions_html.inc.php @@ -61,7 +61,7 @@ function get_icon($date, $is_child_date = false) $size = getimagesize( PHPWG_ROOT_PATH.$icon_url ); $icon_url = get_root_url().$icon_url; $output = '<img title="'.$title.'" src="'.$icon_url.'" class="icon" style="border:0;'; - $output.= 'height:'.$size[1].'px;width:'.$size[0].'px" alt="(!)" />'; + $output.= 'height:'.$size[1].'px;width:'.$size[0].'px" alt="(!)">'; $cache['get_icon']['_icons_'][$key] = $output; } } @@ -307,7 +307,7 @@ function get_html_tag_selection( } $output.= - ' />' + '>' .' '. $tag['name'] .'</label>' .'</li>' @@ -344,7 +344,7 @@ function access_denied() if ( isset($user) and !is_a_guest() ) { echo '<meta http-equiv="Content-Type" content="text/html; charset=utf-8">'; - echo '<div style="text-align:center;">'.l10n('access_forbiden').'<br />'; + echo '<div style="text-align:center;">'.l10n('access_forbiden').'<br>'; echo '<a href="'.get_root_url().'identification.php">'.l10n('identification').'</a> '; echo '<a href="'.make_index_url().'">'.l10n('home').'</a></div>'; echo str_repeat( ' ', 512); //IE6 doesn't error output if below a size @@ -368,7 +368,7 @@ function page_forbidden($msg, $alternate_url=null) $alternate_url = make_index_url(); redirect_html( $alternate_url, '<div style="text-align:left; margin-left:5em;margin-bottom:5em;"> -<h1 style="text-align:left; font-size:36px;">Forbidden</h1><br/>' +<h1 style="text-align:left; font-size:36px;">Forbidden</h1><br>' .$msg.'</div>', 5 ); } @@ -385,7 +385,7 @@ function bad_request($msg, $alternate_url=null) $alternate_url = make_index_url(); redirect_html( $alternate_url, '<div style="text-align:left; margin-left:5em;margin-bottom:5em;"> -<h1 style="text-align:left; font-size:36px;">Bad request</h1><br/>' +<h1 style="text-align:left; font-size:36px;">Bad request</h1><br>' .$msg.'</div>', 5 ); } @@ -402,7 +402,7 @@ function page_not_found($msg, $alternate_url=null) $alternate_url = make_index_url(); redirect_html( $alternate_url, '<div style="text-align:left; margin-left:5em;margin-bottom:5em;"> -<h1 style="text-align:left; font-size:36px;">Page not found</h1><br/>' +<h1 style="text-align:left; font-size:36px;">Page not found</h1><br>' .$msg.'</div>', 5 ); } @@ -486,7 +486,7 @@ function get_tags_content_title() .l10n('remove this tag') .'"><img src="' .get_root_url().get_themeconf('icon_dir').'/remove_s.png' - .'" alt="x" style="vertical-align:bottom;" class="button"/>' + .'" alt="x" style="vertical-align:bottom;" class="button">' .'</a>'; } diff --git a/include/functions_notification.inc.php b/include/functions_notification.inc.php index 885dba6e6..2f6d16ed3 100644 --- a/include/functions_notification.inc.php +++ b/include/functions_notification.inc.php @@ -531,7 +531,7 @@ function get_html_description_recent_post_date($date_detail) .'<a href="'.make_index_url(array('section'=>'recent_pics')).'">' .l10n('recent_pics_cat').'</a>' .')' - .'</li><br/>'; + .'</li><br>'; foreach($date_detail['elements'] as $element) { @@ -541,9 +541,9 @@ function get_html_description_recent_post_date($date_detail) 'image_id' => $element['id'], 'image_file' => $element['file'], )) - .'"><img src="'.$tn_src.'"/></a>'; + .'"><img src="'.$tn_src.'"></a>'; } - $description .= '...<br/>'; + $description .= '...<br>'; $description .= '<li>' diff --git a/include/smarty/libs/plugins/function.html_checkboxes.php b/include/smarty/libs/plugins/function.html_checkboxes.php index ed8ad7f33..7733eea74 100644 --- a/include/smarty/libs/plugins/function.html_checkboxes.php +++ b/include/smarty/libs/plugins/function.html_checkboxes.php @@ -133,7 +133,7 @@ function smarty_function_html_checkboxes_output($name, $value, $output, $selecte if (in_array((string)$value, $selected)) { $_output .= ' checked="checked"'; } - $_output .= $extra . ' />' . $output; + $_output .= $extra . '>' . $output; if ($labels) $_output .= '</label>'; $_output .= $separator; diff --git a/include/smarty/libs/plugins/function.html_image.php b/include/smarty/libs/plugins/function.html_image.php index 9abae72ef..96cd795c2 100644 --- a/include/smarty/libs/plugins/function.html_image.php +++ b/include/smarty/libs/plugins/function.html_image.php @@ -134,7 +134,7 @@ function smarty_function_html_image($params, &$smarty) $height = round($height * $_resize); } - return $prefix . '<img src="'.$path_prefix.$file.'" alt="'.$alt.'" width="'.$width.'" height="'.$height.'"'.$extra.' />' . $suffix; + return $prefix . '<img src="'.$path_prefix.$file.'" alt="'.$alt.'" width="'.$width.'" height="'.$height.'"'.$extra.'>' . $suffix; } /* vim: set expandtab: */ diff --git a/include/smarty/libs/plugins/function.html_radios.php b/include/smarty/libs/plugins/function.html_radios.php index 7503cfaca..c3bc903b0 100644 --- a/include/smarty/libs/plugins/function.html_radios.php +++ b/include/smarty/libs/plugins/function.html_radios.php @@ -146,7 +146,7 @@ function smarty_function_html_radios_output($name, $value, $output, $selected, $ if ((string)$value==$selected) { $_output .= ' checked="checked"'; } - $_output .= $extra . ' />' . $output; + $_output .= $extra . '>' . $output; if ($labels) $_output .= '</label>'; $_output .= $separator; diff --git a/include/smarty/libs/plugins/function.html_select_date.php b/include/smarty/libs/plugins/function.html_select_date.php index e5eb18307..ede9c7be1 100644 --- a/include/smarty/libs/plugins/function.html_select_date.php +++ b/include/smarty/libs/plugins/function.html_select_date.php @@ -268,7 +268,7 @@ function smarty_function_html_select_date($params, &$smarty) if (null !== $year_extra){ $year_result .= ' ' . $year_extra; } - $year_result .= ' />'; + $year_result .= '>'; } else { $years = range((int)$start_year, (int)$end_year); if ($reverse_years) { diff --git a/include/ws_core.inc.php b/include/ws_core.inc.php index c9ee520f6..6d27d0b93 100644 --- a/include/ws_core.inc.php +++ b/include/ws_core.inc.php @@ -203,7 +203,7 @@ class PwgResponseEncoder $changed = 0; $changed += PwgResponseEncoder::_removeNamedArray($value); $changed += PwgResponseEncoder::_removeNamedStruct($value); - // print_r('walk '.$key."<br/>\n"); + // print_r('walk '.$key."<br>\n"); } while ($changed); } @@ -218,7 +218,7 @@ class PwgResponseEncoder print_r( '_mergeAttributesAndContent is_struct='.PwgResponseEncoder::is_struct($value) .' count='.count($value) .' first_key='.$first_key - ."<br/>\n" + ."<br>\n" );*/ $ret = 0; if (PwgResponseEncoder::is_struct($value)) diff --git a/install.php b/install.php index 91d858a6b..94c4d40c6 100644 --- a/install.php +++ b/install.php @@ -297,9 +297,9 @@ define(\'DB_COLLATE\', \'\'); $html_content = htmlentities( $file_content, ENT_QUOTES ); $html_content = nl2br( $html_content ); $error_copy = l10n('step1_err_copy'); - $error_copy .= '<br />--------------------------------------------------------------------<br />'; + $error_copy .= '<br>--------------------------------------------------------------------<br>'; $error_copy .= '<span class="sql_content">' . $html_content . '</span>'; - $error_copy .= '<br />--------------------------------------------------------------------<br />'; + $error_copy .= '<br>--------------------------------------------------------------------<br>'; } @fputs($fp, $file_content, strlen($file_content)); @fclose($fp); diff --git a/language/de_DE/help/configuration.html b/language/de_DE/help/configuration.html index fd795efd6..196673cf8 100644 --- a/language/de_DE/help/configuration.html +++ b/language/de_DE/help/configuration.html @@ -119,8 +119,8 @@ nicht lokalisiert (zB mehrsprachig).</li> <li><strong>Anzeige der Treffer zählen</strong>: Display beobachtet Treffer auf das Bild nur im Rahmen seiner Thumbnail auf die Vorschaubilder Seite. - Nur wenn Advanced Configuration Parameter ist: <br/> - $conf [ 'show_nb_hits'] = true; <br/> + Nur wenn Advanced Configuration Parameter ist: <br> + $conf [ 'show_nb_hits'] = true; <br> Hinweis: Es ist false per Default.</li> <li><strong>Maximale Breite der Bilder</strong>: maximal angezeigt diff --git a/language/de_DE/help/extend_for_templates.html b/language/de_DE/help/extend_for_templates.html index c75842a0e..266b96fed 100644 --- a/language/de_DE/help/extend_for_templates.html +++ b/language/de_DE/help/extend_for_templates.html @@ -90,7 +90,7 @@ class="pwgScreen">index.php? /<strong> most_visited</strong></span></p> ausgewählten replacers.</li> <li>Unterordner: -Unterordner werden ignoriert, aber sie sind nützlich, eine Änderung der derzeitigen Reihenfolge. <br /> +Unterordner werden ignoriert, aber sie sind nützlich, eine Änderung der derzeitigen Reihenfolge. <br> distributed-Proben: für Test-Zwecke verteilt werden! <strong>nicht bearbeiten</strong> Erstellen Sie Ihren eigenen sind. </li> @@ -98,4 +98,4 @@ distributed-Proben: für Test-Zwecke verteilt werden! <li>Am löschen eines Replacer <strong>der Original-Vorlage</strong> ist sofort reaktiviert.</li> -</ul>
\ No newline at end of file +</ul> diff --git a/language/de_DE/install.lang.php b/language/de_DE/install.lang.php index db5c9e2b4..4410a0fac 100644 --- a/language/de_DE/install.lang.php +++ b/language/de_DE/install.lang.php @@ -55,9 +55,9 @@ $lang['step2_pwd_info'] = 'Administratorpasswort'; $lang['step2_pwd_conf'] = 'Passwort [Bestätigung]'; $lang['step2_pwd_conf_info'] = 'Wiederholen Sie das eingegebene Passwort'; $lang['step1_err_copy'] = 'Kopieren Sie den rosa Text ohne die Bindestriche und fügen Sie ihn in die Datei "include / mysql.inc.php" auf dem Webserver ein (Warnung: die Datei "mysql.inc.php" darf nur die rosa Zeichen enthalten, nicht mehr und nicht weniger)'; -$lang['install_help'] = 'Brauchen Sie Hilfe? Stellen Sie Ihre Frage auf der <a href="%s"> Forum Piwigo </ a>.'; -$lang['install_end_message'] = 'Die Konfiguration der Piwigo abgeschlossen ist, hier ist der nächste Schritt<br /><br /> -* Gehen Sie zum Anmelden auf die Startseite: [ <a href="./identification.php">Identifizierung</a> ] und verwenden Sie die Login / Passwort für Webmaster<br /> +$lang['install_help'] = 'Brauchen Sie Hilfe? Stellen Sie Ihre Frage auf der <a href="%s"> Forum Piwigo </a>.'; +$lang['install_end_message'] = 'Die Konfiguration der Piwigo abgeschlossen ist, hier ist der nächste Schritt<br><br> +* Gehen Sie zum Anmelden auf die Startseite: [ <a href="./identification.php">Identifizierung</a> ] und verwenden Sie die Login / Passwort für Webmaster<br> * diesem Login ermöglicht Ihnen den Zugang zu den Verwaltungs-Panel und der Bilder- und Benutzerverwaltung.'; $lang['conf_mail_webmaster'] = 'Webmaster Mail-Adresse'; $lang['conf_mail_webmaster_info'] = 'Kontakt E-Mailadresse (nur für angemeldete Benutzer sichtbar)'; diff --git a/language/en_UK/help/configuration.html b/language/en_UK/help/configuration.html index da4c59a75..e62d6ffc3 100644 --- a/language/en_UK/help/configuration.html +++ b/language/en_UK/help/configuration.html @@ -120,8 +120,8 @@ users.</p> <li><strong>Show hits count</strong>: display hits observed on picture just under its thumbnail on the thumbnails page. - Only when advanced configuration parameter is: <br /> - $conf['show_nb_hits'] = true; <br /> + Only when advanced configuration parameter is: <br> + $conf['show_nb_hits'] = true; <br> Notice: it is false by default.</li> <li><strong>Maximum width of the pictures</strong>: maximum displayed diff --git a/language/en_UK/help/extend_for_templates.html b/language/en_UK/help/extend_for_templates.html index dfe124615..4c553745f 100644 --- a/language/en_UK/help/extend_for_templates.html +++ b/language/en_UK/help/extend_for_templates.html @@ -89,7 +89,7 @@ will be operate only on pages with this keyword. For example: <span selected replacers.</li> <li>Subfolders: -Subfolders are ignored but they are usefull to change current order.<br /> +Subfolders are ignored but they are usefull to change current order.<br> distributed-samples: for test purpose are distributed! <strong>Don't edit them</strong> create your own ones. </li> @@ -97,4 +97,4 @@ distributed-samples: for test purpose are distributed! <li>On delete of a replacer the <strong>Original template</strong> is immediately reactivated.</li> -</ul>
\ No newline at end of file +</ul> diff --git a/language/en_UK/install.lang.php b/language/en_UK/install.lang.php index 9396106c3..07d64d4ad 100644 --- a/language/en_UK/install.lang.php +++ b/language/en_UK/install.lang.php @@ -58,8 +58,8 @@ $lang['step2_pwd_info'] = 'Keep it confidential, it enables you to access admini $lang['step2_pwd_conf'] = 'Password [confirm]'; $lang['step2_pwd_conf_info'] = 'verification'; $lang['install_help'] = 'Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'; -$lang['install_end_message'] = 'The configuration of Piwigo is finished, here is the next step<br /><br /> -* go to the identification page and use the login/password given for webmaster<br /> +$lang['install_end_message'] = 'The configuration of Piwigo is finished, here is the next step<br><br> +* go to the identification page and use the login/password given for webmaster<br> * this login will enable you to access to the administration panel and to the instructions in order to place pictures in your directories'; $lang['conf_mail_webmaster'] = 'Webmaster mail address'; $lang['conf_mail_webmaster_info'] = 'Visitors will be able to contact site administrator with this mail'; diff --git a/language/es_ES/help/configuration.html b/language/es_ES/help/configuration.html index ea46dd585..1bc32dfd7 100644 --- a/language/es_ES/help/configuration.html +++ b/language/es_ES/help/configuration.html @@ -91,8 +91,8 @@ class="pwgScreen">perfila</span>.</p> <li><strong>Mostrar el número de comentarios</strong>: Mostrar número utilizador de comentarios debajo de cada miniatura. Consume recursos.</li> <li><strong>Mostrar el número de visualizaciones </strong>: Fija los "hits" rehechos sobre una imagen bajo su miniatura en la página de miniaturas. - Únicamente válido si el parámetro de configuración avanzada es:<br /> - $conf['show_nb_hits'] = true; <br /> + Únicamente válido si el parámetro de configuración avanzada es:<br> + $conf['show_nb_hits'] = true; <br> N.B.: por defaut es a false.</li> <li><strong>Anchura máxima de las imágenes</strong>: A la fijación. Si la imagen es más ancha que este parámetro, entonces será redimensionnée a la fijación. Si usted piensa en neceser de modificar este parametraje (pues para una fijación por defecto), serÃa pertinente de directamente redimensionner sus imágenes almacenadas.</li> diff --git a/language/es_ES/help/extend_for_templates.html b/language/es_ES/help/extend_for_templates.html index 7cd4b7ff6..ba35b2f34 100644 --- a/language/es_ES/help/extend_for_templates.html +++ b/language/es_ES/help/extend_for_templates.html @@ -92,7 +92,7 @@ class="filename">template-extension/my-extension/video.tpl</span>.</p> Asà como mencionada más arriba, la orden puede inhibir por los sustitutos precedentes.</li> <li>Subexpedientes : - Los subexpedientes son ignorados pero son útiles para modificar la orden de los sustitutos. <br /> + Los subexpedientes son ignorados pero son útiles para modificar la orden de los sustitutos. <br> distributed-samples: ¡ para sus pruebas son distributés! <strong>No modificarlos :</strong>¡ Cree vuestros! </li> @@ -100,4 +100,4 @@ class="filename">template-extension/my-extension/video.tpl</span>.</p> <li>A la supresión del sustituto el <strong> template de origen </strong> inmediatamente será reactivado.</li> -</ul>
\ No newline at end of file +</ul> diff --git a/language/es_ES/install.lang.php b/language/es_ES/install.lang.php index dab931f47..9bdbb5e0b 100644 --- a/language/es_ES/install.lang.php +++ b/language/es_ES/install.lang.php @@ -56,8 +56,8 @@ $lang['step2_pwd_conf'] = 'Palabra de paso [Confirmar]'; $lang['step2_pwd_conf_info'] = 'Comprobación'; $lang['step1_err_copy'] = 'Copie el texto en rosa entre las rayas y pegúelo en el fichero mysql.inc.php que se encuentra en el repertorio " include " a la base del lugar donde usted instaló a Piwigo (el fichero mysql.inc.php debe contener SÓLO lo que está en rosa entre las rayas, ninguna vuelta a la lÃnea o espacio es autorizado)'; $lang['install_help'] = '¿ Necesidad de ayudante? Plantee su cuestión sobre él <a href="%s">foro de Piwigo</a>.'; -$lang['install_end_message'] = 'La configuración de la aplicación correctamente se celebró, coloca en la etapa próxima<br /><br /> -* Vaya sobre la página de identificación y conéctese con pseudo dado para el webmaster<br /> +$lang['install_end_message'] = 'La configuración de la aplicación correctamente se celebró, coloca en la etapa próxima<br><br> +* Vaya sobre la página de identificación y conéctese con pseudo dado para el webmaster<br> * Éste le permite acceder a la parte administración y a las instrucciones para colocar las imágenes en los repertorios.'; $lang['conf_mail_webmaster'] = 'Dirige e-mail del Administrador'; $lang['conf_mail_webmaster_info'] = 'Los visitadores podrán ponerse en contacto con usted por este mail'; diff --git a/language/fr_FR/help/configuration.html b/language/fr_FR/help/configuration.html index 8539767fd..c621c3db7 100644 --- a/language/fr_FR/help/configuration.html +++ b/language/fr_FR/help/configuration.html @@ -122,8 +122,8 @@ ressources.</li> <li><strong>Montrer le nombre de visualisations </strong>: affiche les « hits » relevés sur une image sous sa miniature dans la page de miniatures. - Uniquement valable si le paramètre de configuration avancée est :<br /> - $conf['show_nb_hits'] = true; <br /> + Uniquement valable si le paramètre de configuration avancée est :<br> + $conf['show_nb_hits'] = true; <br> N.B.: par defaut il est à false.</li> <li><strong>Largeur maximum des images</strong>: à l'affichage. Si l'image diff --git a/language/fr_FR/help/extend_for_templates.html b/language/fr_FR/help/extend_for_templates.html index c173b3467..3491cd071 100644 --- a/language/fr_FR/help/extend_for_templates.html +++ b/language/fr_FR/help/extend_for_templates.html @@ -90,7 +90,7 @@ ne seront réalisés que sur les pages utilisant ce mot clé. Par exemple: <span Comme mentionné ci-dessus, l'ordre peut inhiber les remplaçants précédents.</li> <li>Sous-dossiers: - Les sous-dossiers sont ignorés mais ils sont utiles pour modifier l'ordre des remplaçants.<br /> + Les sous-dossiers sont ignorés mais ils sont utiles pour modifier l'ordre des remplaçants.<br> distributed-samples: pour vos tests sont distributés! <strong>Ne pas les modifier</strong>, créez les votres! </li> @@ -98,4 +98,4 @@ distributed-samples: pour vos tests sont distributés! <li>A la suppression d'un remplaçant le <strong>template d'origine</strong> sera immédiatement réactivé.</li> -</ul>
\ No newline at end of file +</ul> diff --git a/language/fr_FR/install.lang.php b/language/fr_FR/install.lang.php index 507236db7..184c77460 100644 --- a/language/fr_FR/install.lang.php +++ b/language/fr_FR/install.lang.php @@ -56,8 +56,8 @@ $lang['step2_pwd_conf'] = 'Mot de passe [ Confirmer ]'; $lang['step2_pwd_conf_info'] = 'Vérification'; $lang['step1_err_copy'] = 'Copiez le texte en rose entre les tirets et collez-le dans le fichier mysql.inc.php qui se trouve dans le répertoire "include" à la base de l\'endroit où vous avez installé Piwigo (le fichier mysql.inc.php ne doit comporter QUE ce qui est en rose entre les tirets, aucun retour à la ligne ou espace n\'est autorisé)'; $lang['install_help'] = 'Besoin d\'aide ? Posez votre question sur le <a href="%s">forum de Piwigo</a>.'; -$lang['install_end_message'] = 'La configuration de l\'application s\'est correctement déroulée, place à la prochaine étape<br /><br /> -* allez sur la page d\'identification et connectez-vous avec le pseudo donné pour le webmaster<br /> +$lang['install_end_message'] = 'La configuration de l\'application s\'est correctement déroulée, place à la prochaine étape<br><br> +* allez sur la page d\'identification et connectez-vous avec le pseudo donné pour le webmaster<br> * celui-ci vous permet d\'accéder à la partie administration et aux instructions pour placer les images dans les répertoires.'; $lang['conf_mail_webmaster'] = 'Adresse e-mail de l\'Administrateur'; $lang['conf_mail_webmaster_info'] = 'Les visiteurs pourront vous contacter par ce mail'; diff --git a/language/it_IT/help/configuration.html b/language/it_IT/help/configuration.html index a798f0c27..500ce6039 100644 --- a/language/it_IT/help/configuration.html +++ b/language/it_IT/help/configuration.html @@ -111,8 +111,8 @@ di commenti sotto ogni miniatura. Consuma delle risorse.</li> <li><strong>Mostrare il numero di visite</strong>: visualizza il numero di visualizzazioni del immagine sotto la miniatura. -Valido solo se il parametro è : <br /> -$conf['show_nb_hits'] = true; <br /> +Valido solo se il parametro è : <br> +$conf['show_nb_hits'] = true; <br> N.B.: Di default il parametro è a false.</li> <li><strong>Larghezza massima delle immagini</strong>: di visualizzazione. diff --git a/language/it_IT/help/extend_for_templates.html b/language/it_IT/help/extend_for_templates.html index bcfc92543..c7774225a 100644 --- a/language/it_IT/help/extend_for_templates.html +++ b/language/it_IT/help/extend_for_templates.html @@ -89,7 +89,7 @@ unicamente sulle pagine con questa parola chiave. Per esempio: <span Come detto precedente, l'ordine può annullare i rimpiazzanti precedenti.</li> <li>Le sottodirectory: - Le sottodirectory sono ignorate ma sono utili per cambiare l'ordine dei rimpiazzanti.<br /> + Le sottodirectory sono ignorate ma sono utili per cambiare l'ordine dei rimpiazzanti.<br> distributed-samples: sono distribuite per le vostre prove! <strong>Non modificateli</strong>, create i vostri! </li> @@ -97,4 +97,4 @@ distributed-samples: sono distribuite per le vostre prove! <li>Alla cancellazione di un rimpiazzante il <strong>templete originale</strong> è immediatamente riattivato.</li> -</ul>
\ No newline at end of file +</ul> diff --git a/language/it_IT/install.lang.php b/language/it_IT/install.lang.php index 45c19e972..984581576 100644 --- a/language/it_IT/install.lang.php +++ b/language/it_IT/install.lang.php @@ -56,8 +56,8 @@ $lang['step2_pwd_conf'] = 'Password [confermare]'; $lang['step2_pwd_conf_info'] = 'verifica'; $lang['step1_err_copy'] = 'Copiate il testo in rosa trà i trattini e mettetelo nel file mysql.inc.php che si trova nella directory "include" alla base del vostro sito dove aveto installato Piwigo (il file mysql.inc.php non deve contenere altro che ciò che è in rosa tra i trattini, nessun ritorno a capo o spazio è autorizzato)'; $lang['install_help'] = 'Bisogno di un aiuto? Visitate il <a href="%s">forum di Piwigo</a>.'; -$lang['install_end_message'] = 'La configurazione di Piwigo è conclusa. Procedete al prossimo step<br /><br /> -* collegatevi alla pagina d\'accesso e usare come nome d\'utente e password quello del Webmaster<br /> +$lang['install_end_message'] = 'La configurazione di Piwigo è conclusa. Procedete al prossimo step<br><br> +* collegatevi alla pagina d\'accesso e usare come nome d\'utente e password quello del Webmaster<br> * a questo punto sarete abilitati all\'accesso al pannello di amministrazione in cui troverete le istruzioni per l\'inserimento delle immagini nelle vostre directory'; $lang['conf_mail_webmaster'] = 'Indirizzo email del Amministratore'; $lang['conf_mail_webmaster_info'] = 'i visitatori potranno contattarvi utilizzando questo indirizzo email'; diff --git a/language/nl_NL/help/configuration.html b/language/nl_NL/help/configuration.html index 25d6405c9..ccb2d4d62 100644 --- a/language/nl_NL/help/configuration.html +++ b/language/nl_NL/help/configuration.html @@ -95,7 +95,7 @@ en toont mogelijk een erg groot menu als je categorie erg veel sub categorieën <li><strong>Aantal commentaren tonen</strong>: Het aantal commentaren zichtbaar bij een afbeelding op de thumbnails pagina. Zware belasting.</li> <li><strong>Toon aantal hits</strong>: Toon het aantal keren dat een afbeelding bekeken is, onder de afbeelding op de thumbnails pagina. - Allen mogelijk als de geavanceerde configuratie parameter is: <br /> $conf['show_nb_hits'] = true; <br /> + Allen mogelijk als de geavanceerde configuratie parameter is: <br> $conf['show_nb_hits'] = true; <br> Opmerking: standaars is dit false.</li> <li><strong>Maximale breedte van de afbeeldingen</strong>: maximale toonbare breedte. Als de afbeeldingen groter zijn dan deze instelling, worden ze verkleind op het scherm. Als je deze optie gebruikt, denk er dan over na om de afbeelding aan te passen voor je ze plaatst op je gallery.</li> diff --git a/language/nl_NL/help/extend_for_templates.html b/language/nl_NL/help/extend_for_templates.html index dfe124615..4c553745f 100644 --- a/language/nl_NL/help/extend_for_templates.html +++ b/language/nl_NL/help/extend_for_templates.html @@ -89,7 +89,7 @@ will be operate only on pages with this keyword. For example: <span selected replacers.</li> <li>Subfolders: -Subfolders are ignored but they are usefull to change current order.<br /> +Subfolders are ignored but they are usefull to change current order.<br> distributed-samples: for test purpose are distributed! <strong>Don't edit them</strong> create your own ones. </li> @@ -97,4 +97,4 @@ distributed-samples: for test purpose are distributed! <li>On delete of a replacer the <strong>Original template</strong> is immediately reactivated.</li> -</ul>
\ No newline at end of file +</ul> diff --git a/language/nl_NL/install.lang.php b/language/nl_NL/install.lang.php index 50add9392..22bdedbeb 100644 --- a/language/nl_NL/install.lang.php +++ b/language/nl_NL/install.lang.php @@ -58,8 +58,8 @@ $lang['step2_pwd_info'] = 'Hou dit vertrouwlijk, dit geeft toegang tot de beheer $lang['step2_pwd_conf'] = 'Wachtwoord [bevestigen]'; $lang['step2_pwd_conf_info'] = 'verificatie'; $lang['install_help'] = 'Hulp nodig ? stel een vraag op het <a href="%s" target="_blank">Piwigo forum</a>.'; -$lang['install_end_message'] = 'Het installeren van Piwigo is klaar, de volgende stap is<br /><br /> -* Ga naar de Indentificatie pagina en gebruik hiervoor het eerder opgegeven gebruikersnaam met wachtwoord<br /> +$lang['install_end_message'] = 'Het installeren van Piwigo is klaar, de volgende stap is<br><br> +* Ga naar de Indentificatie pagina en gebruik hiervoor het eerder opgegeven gebruikersnaam met wachtwoord<br> * Deze gebruikersnaam geeft u toegang tot de beheermenu zodat u afbeeldingen op uw website kan plaatsen'; $lang['conf_mail_webmaster'] = 'Webmaster email adres'; $lang['conf_mail_webmaster_info'] = 'Het is mogelijk dat bezoekers contact opnemen met de beheerder middels e-mail'; diff --git a/language/pl_PL/help/configuration.html b/language/pl_PL/help/configuration.html index 8f22bea65..34ecb0e7e 100644 --- a/language/pl_PL/help/configuration.html +++ b/language/pl_PL/help/configuration.html @@ -97,8 +97,8 @@ Uprawnienia, Użytkownicy</span>, gdzie opcje mżna zmienić dla wybranych użyt <li><strong>Pokazuj liczbę komentarzy</strong>: wyświetla liczbę komentarzy na stronie z miniaturami. Wymaga dużych zasobów.</li> <li><strong>Pokazuj liczbę wejść</strong>: wyświetla liczbę wyświetleń danego obrazu na stronei z miniaturami. - Tylko gdy zaawansowany parametr jest ustawiony na: <br /> - $conf['show_nb_hits'] = true; <br /> + Tylko gdy zaawansowany parametr jest ustawiony na: <br> + $conf['show_nb_hits'] = true; <br> Notka: domyślne ustawienie to false.</li> <li><strong>Maksymalna szerokość obrazu</strong>: maksymalna wyświetlana szerokość. Jeżeli obraz jest większy, to wtedy zostanie pomniejszony (do wyświetlenia). Jeżeli chcesz zaznaczyć tę opcję, lepiej jest rozważyć zmianę rozmiarów obrazów.</li> diff --git a/language/pl_PL/help/extend_for_templates.html b/language/pl_PL/help/extend_for_templates.html index 87202aa65..dd38612f9 100644 --- a/language/pl_PL/help/extend_for_templates.html +++ b/language/pl_PL/help/extend_for_templates.html @@ -77,11 +77,11 @@ class="filename">template-extension/moje-rozszerzenia/wideo.tpl</span>.</p> <li>Odznaczenie <strong>opcjonalnego słowa klucz dla adresu URL</strong> aktywuje zamiennik dla dowolnego uzycia szablonu. Jak już wspomniano wcześniej, kolejność może nadpisać poprzednio wybrane zamienniki.</li> <li>Podkatalogi: -Podkatalogi są ignorowane, ale są przydatne aby zmienić kolejność.<br /> +Podkatalogi są ignorowane, ale są przydatne aby zmienić kolejność.<br> distributed-samples: rozpowszechniane dla celów testowych! <strong>Nie edytuj ich</strong>, ale stwórz własne. </li> <li>Po usunięciu zamiennika natychmiastowo jest aktywowany <strong>Szablon oryginalny</strong>.</li> -</ul>
\ No newline at end of file +</ul> diff --git a/language/pl_PL/install.lang.php b/language/pl_PL/install.lang.php index 2ab72a555..399e827a6 100644 --- a/language/pl_PL/install.lang.php +++ b/language/pl_PL/install.lang.php @@ -58,8 +58,8 @@ $lang['step2_pwd_info'] = 'Zachowaj hasło, umożliwia ono dostep do panelu admi $lang['step2_pwd_conf'] = 'Hasło [potwierdź]'; $lang['step2_pwd_conf_info'] = 'weryfikacja'; $lang['install_help'] = 'Potrzebujesz pomocy ? Zadaj pytanie na <a href="%s">Forum Piwigo</a>.'; -$lang['install_end_message'] = 'Konfiguracja Piwigo została zakończona, następny krok to<br /><br /> -* przejdź do strony logowania : [ <a href="identification.php">logowanie</a> ] i wprowadź użytkownika/hasło będącego webmaster\'em<br /> +$lang['install_end_message'] = 'Konfiguracja Piwigo została zakończona, następny krok to<br><br> +* przejdź do strony logowania : [ <a href="identification.php">logowanie</a> ] i wprowadź użytkownika/hasło będącego webmaster\'em<br> * logowanie to umożliwi Ci dostęp do panelu administracyjnego oraz instrukcji jak umieszczaćzdjęcia w katalogach'; $lang['conf_mail_webmaster'] = 'Adres email Webmaster\'a'; $lang['conf_mail_webmaster_info'] = 'Z jego pomocą odwiedzający będą mogli się skontaktować z administratorem strony'; diff --git a/template-extension/distributed/samples/my-picture.tpl b/template-extension/distributed/samples/my-picture.tpl index 1f3d2688e..fceebd9ab 100644 --- a/template-extension/distributed/samples/my-picture.tpl +++ b/template-extension/distributed/samples/my-picture.tpl @@ -41,7 +41,7 @@ {if isset($U_SLIDESHOW_STOP) } <a href="{$U_SLIDESHOW_STOP}" title="{'slideshow_stop'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/stop_slideshow.png" class="button" alt="{'slideshow_stop'|@translate}"></a> {/if} - <a href="{$U_METADATA}" title="{'picture_show_metadata'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/metadata.png" class="button" alt="metadata" /></a> + <a href="{$U_METADATA}" title="{'picture_show_metadata'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/metadata.png" class="button" alt="metadata"></a> {if isset($current.U_DOWNLOAD) } <a href="{$current.U_DOWNLOAD}" title="{'download_hint'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/save.png" class="button" alt="{'download'|@translate}"></a> {/if} @@ -104,4 +104,4 @@ y.callService( </a> {/if} -{if !empty($PLUGIN_PICTURE_AFTER)}{$PLUGIN_PICTURE_AFTER}{/if}
\ No newline at end of file +{if !empty($PLUGIN_PICTURE_AFTER)}{$PLUGIN_PICTURE_AFTER}{/if} diff --git a/template-extension/distributed/samples/my-thumbnails.tpl b/template-extension/distributed/samples/my-thumbnails.tpl index 068ec5561..65a3ea29f 100644 --- a/template-extension/distributed/samples/my-thumbnails.tpl +++ b/template-extension/distributed/samples/my-thumbnails.tpl @@ -7,24 +7,24 @@ <span class="wrap1"> <span class="wrap2"> <a href="{$thumbnail.URL}"> - <img class="thumbnail" src="{$thumbnail.TN_SRC}" alt="{$thumbnail.TN_ALT}" title="{$thumbnail.TN_TITLE}" /> + <img class="thumbnail" src="{$thumbnail.TN_SRC}" alt="{$thumbnail.TN_ALT}" title="{$thumbnail.TN_TITLE}"> </a> </span> <span class="thumbLegend" style="color:#F36;"> - © 2008 Piwigo<br /> + © 2008 Piwigo<br> {if !empty($thumbnail.NAME)}{$thumbnail.NAME}{/if} {if !empty($thumbnail.ICON_TS)}{$thumbnail.ICON_TS}{/if} {if isset($thumbnail.NB_COMMENTS)} <span class="{if 0==$thumbnail.NB_COMMENTS}zero {/if}nb-comments"> - <br /> + <br> {$pwg->l10n_dec('%d comment', '%d comments',$thumbnail.NB_COMMENTS)} </span> {/if} {if isset($thumbnail.NB_HITS)} <span class="{if 0==$thumbnail.NB_HITS}zero {/if}nb-hits"> - <br /> + <br> {$pwg->l10n_dec('%d hit', '%d hits',$thumbnail.NB_HITS)} </span> {/if} @@ -33,4 +33,4 @@ </li> {/foreach} </ul> -{/if}
\ No newline at end of file +{/if} diff --git a/template-extension/distributed/samples/my-thumbnails2.tpl b/template-extension/distributed/samples/my-thumbnails2.tpl index ec16fdc83..52bb87428 100644 --- a/template-extension/distributed/samples/my-thumbnails2.tpl +++ b/template-extension/distributed/samples/my-thumbnails2.tpl @@ -10,10 +10,10 @@ {if !empty($thumbnail.NAME)}{$thumbnail.NAME}{/if} </legend> <a href="{$thumbnail.URL}" class="lap2"> - <span><img class="thumbnail" src="{$thumbnail.TN_SRC}" alt="{$thumbnail.TN_ALT}" title="{$thumbnail.TN_TITLE}" /></span> + <span><img class="thumbnail" src="{$thumbnail.TN_SRC}" alt="{$thumbnail.TN_ALT}" title="{$thumbnail.TN_TITLE}"></span> </a> </fieldset> </li> {/foreach} </ul> -{/if}
\ No newline at end of file +{/if} diff --git a/template/yoga/about.tpl b/template/yoga/about.tpl index 62b51839d..d9e935205 100644 --- a/template/yoga/about.tpl +++ b/template/yoga/about.tpl @@ -4,7 +4,7 @@ <ul class="categoryActions"> <li> <a href="{$U_HOME}" title="{'return to homepage'|@translate}"> - <img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/> + <img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"> </a> </li> </ul> diff --git a/template/yoga/comment_list.tpl b/template/yoga/comment_list.tpl index ee4f4efb8..d1ebc2f26 100644 --- a/template/yoga/comment_list.tpl +++ b/template/yoga/comment_list.tpl @@ -6,7 +6,7 @@ {if isset($comment.TN_SRC)} <div class="illustration"> <a href="{$comment.U_PICTURE}"> - <img src="{$comment.TN_SRC}" alt="{$comment.ALT}" /> + <img src="{$comment.TN_SRC}" alt="{$comment.ALT}"> </a> </div> {/if} @@ -16,14 +16,14 @@ {if isset($comment.U_DELETE)} <li> <a href="{$comment.U_DELETE}" title="{'delete this comment'|@translate}"> - <img src="{$ROOT_URL}{$themeconf.icon_dir}/delete.png" class="button" alt="[delete]" /> + <img src="{$ROOT_URL}{$themeconf.icon_dir}/delete.png" class="button" alt="[delete]"> </a> </li> {/if} {if isset($comment.U_VALIDATE)} <li> <a href="{$comment.U_VALIDATE}" title="validate this comment"> - <img src="{$ROOT_URL}{$themeconf.icon_dir}/validate_s.png" class="button" alt="[validate]" /> + <img src="{$ROOT_URL}{$themeconf.icon_dir}/validate_s.png" class="button" alt="[validate]"> </a> </li> {/if} @@ -35,7 +35,7 @@ </div> </li> {if isset($comment_separator)} -<hr/> +<hr> {/if} {/foreach} -</ul>
\ No newline at end of file +</ul> diff --git a/template/yoga/comments.tpl b/template/yoga/comments.tpl index 13994c0a7..3262fe7b2 100644 --- a/template/yoga/comments.tpl +++ b/template/yoga/comments.tpl @@ -3,7 +3,7 @@ <div class="titrePage"> <ul class="categoryActions"> - <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li> + <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"></a></li> </ul> <h2>{'User comments'|@translate}</h2> </div> @@ -13,9 +13,9 @@ <fieldset> <legend>{'Filter'|@translate}</legend> - <label>{'Keyword'|@translate}<input type="text" name="keyword" value="{$F_KEYWORD}" /></label> + <label>{'Keyword'|@translate}<input type="text" name="keyword" value="{$F_KEYWORD}"></label> - <label>{'Author'|@translate}<input type="text" name="author" value="{$F_AUTHOR}" /></label> + <label>{'Author'|@translate}<input type="text" name="author" value="{$F_AUTHOR}"></label> <label> {'Category'|@translate} diff --git a/template/yoga/header.tpl b/template/yoga/header.tpl index abe063799..589ac288b 100644 --- a/template/yoga/header.tpl +++ b/template/yoga/header.tpl @@ -76,7 +76,7 @@ {if not empty($header_msgs)} <div class="header_msgs"> {foreach from=$header_msgs item=elt} - {$elt}<br /> + {$elt}<br> {/foreach} </div> {/if} diff --git a/template/yoga/identification.tpl b/template/yoga/identification.tpl index 944954be5..d3fac035e 100644 --- a/template/yoga/identification.tpl +++ b/template/yoga/identification.tpl @@ -5,9 +5,9 @@ <ul class="categoryActions"> <li><a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/lost_password.png" class="button" alt="{'Forgot your password?'|@translate}"></a></li> {if isset($U_REGISTER) } - <li><a href="{$U_REGISTER}" title="{'Create a new account'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/register.png" class="button" alt="{'Register'|@translate}"/></a></li> + <li><a href="{$U_REGISTER}" title="{'Create a new account'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/register.png" class="button" alt="{'Register'|@translate}"></a></li> {/if} - <li><a href="{$U_HOME}" title="{'Go through the gallery as a visitor'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li> + <li><a href="{$U_HOME}" title="{'Go through the gallery as a visitor'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"></a></li> </ul> <h2>{'Identification'|@translate}</h2> </div> @@ -33,14 +33,14 @@ <span class="property"> <label for="username">{'Username'|@translate}</label> </span> - <input tabindex="1" class="login" type="text" name="username" id="username" size="25" maxlength="40" /> + <input tabindex="1" class="login" type="text" name="username" id="username" size="25" maxlength="40"> </li> <li> <span class="property"> <label for="password">{'Password'|@translate}</label> </span> - <input tabindex="2" class="login" type="password" name="password" id="password" size="25" maxlength="25" /> + <input tabindex="2" class="login" type="password" name="password" id="password" size="25" maxlength="25"> </li> {if $authorize_remembering } diff --git a/template/yoga/index.tpl b/template/yoga/index.tpl index c270fc891..fcafb8fd8 100644 --- a/template/yoga/index.tpl +++ b/template/yoga/index.tpl @@ -20,35 +20,35 @@ {/if} {if isset($U_CADDIE) } - <li><a href="{$U_CADDIE}" title="{'add to caddie'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/caddie_add.png" class="button" alt="{'caddie'|@translate}"/></a></li> + <li><a href="{$U_CADDIE}" title="{'add to caddie'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/caddie_add.png" class="button" alt="{'caddie'|@translate}"></a></li> {/if} {if isset($U_EDIT) } - <li><a href="{$U_EDIT}" title="{'edit category informations'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/category_edit.png" class="button" alt="{'edit'|@translate}"/></a></li> + <li><a href="{$U_EDIT}" title="{'edit category informations'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/category_edit.png" class="button" alt="{'edit'|@translate}"></a></li> {/if} {if isset($U_SEARCH_RULES) } - <li><a href="{$U_SEARCH_RULES}" onclick="popuphelp(this.href); return false;" title="{'Search rules'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/search_rules.png" class="button" alt="(?)" /></a></li> + <li><a href="{$U_SEARCH_RULES}" onclick="popuphelp(this.href); return false;" title="{'Search rules'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/search_rules.png" class="button" alt="(?)"></a></li> {/if} {if isset($U_SLIDESHOW) } - <li><a href="{$U_SLIDESHOW}" title="{'slideshow'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/start_slideshow.png" class="button" alt="{'slideshow'|@translate}"/></a></li> + <li><a href="{$U_SLIDESHOW}" title="{'slideshow'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/start_slideshow.png" class="button" alt="{'slideshow'|@translate}"></a></li> {/if} {if isset($U_MODE_FLAT) } - <li><a href="{$U_MODE_FLAT}" title="{'mode_flat_hint'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/flat.png" class="button" alt="{'mode_flat_hint'|@translate}" /></a></li> + <li><a href="{$U_MODE_FLAT}" title="{'mode_flat_hint'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/flat.png" class="button" alt="{'mode_flat_hint'|@translate}"></a></li> {/if} {if isset($U_MODE_NORMAL) } - <li><a href="{$U_MODE_NORMAL}" title="{'mode_normal_hint'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/normal_mode.png" class="button" alt="{'mode_normal_hint'|@translate}" /></a></li> + <li><a href="{$U_MODE_NORMAL}" title="{'mode_normal_hint'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/normal_mode.png" class="button" alt="{'mode_normal_hint'|@translate}"></a></li> {/if} {if isset($U_MODE_POSTED) } - <li><a href="{$U_MODE_POSTED}" title="{'mode_posted_hint'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/calendar.png" class="button" alt="{'mode_posted_hint'|@translate}" /></a></li> + <li><a href="{$U_MODE_POSTED}" title="{'mode_posted_hint'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/calendar.png" class="button" alt="{'mode_posted_hint'|@translate}"></a></li> {/if} {if isset($U_MODE_CREATED) } - <li><a href="{$U_MODE_CREATED}" title="{'mode_created_hint'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/calendar_created.png" class="button" alt="{'mode_created_hint'|@translate}" /></a></li> + <li><a href="{$U_MODE_CREATED}" title="{'mode_created_hint'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/calendar_created.png" class="button" alt="{'mode_created_hint'|@translate}"></a></li> {/if} {if !empty($PLUGIN_INDEX_ACTIONS)}{$PLUGIN_INDEX_ACTIONS}{/if} diff --git a/template/yoga/mail/text/html/footer.tpl b/template/yoga/mail/text/html/footer.tpl index 1b0b8c19c..bdd3e7cb0 100644 --- a/template/yoga/mail/text/html/footer.tpl +++ b/template/yoga/mail/text/html/footer.tpl @@ -1,7 +1,7 @@ {* $Id$ *} </div> <!-- content --> <div id="copyright"> -<hr/> +<hr> {* Please, do not remove this copyright. If you really want to, contact us on http://piwigo.org to find a solution on how to show the origin of the script...*} diff --git a/template/yoga/mail/text/html/notification_by_mail.tpl b/template/yoga/mail/text/html/notification_by_mail.tpl index 52627ebe4..225f11313 100644 --- a/template/yoga/mail/text/html/notification_by_mail.tpl +++ b/template/yoga/mail/text/html/notification_by_mail.tpl @@ -40,11 +40,11 @@ <p>{'nbm_content_byebye'|@translate}</p> <p style="text-align:center">{$SEND_AS_NAME}</p> <p> -<br/><hr/> -{'nbm_content_unsubscribe_link'|@translate}{'nbm_content_click_on'|@translate}<a href="{$UNSUBSCRIBE_LINK}">{$UNSUBSCRIBE_LINK}</a><br/> -{'nbm_content_subscribe_link'|@translate}{'nbm_content_click_on'|@translate}<a href="{$SUBSCRIBE_LINK}">{$SUBSCRIBE_LINK}</a><br/> -{'nbm_content_problem_contact'|@translate}<a href="mailto:{$CONTACT_EMAIL}?subject={'nbm_content_pb_contact_object'|@translate}">{$CONTACT_EMAIL}</a><br/> -<hr/><br/> +<br><hr> +{'nbm_content_unsubscribe_link'|@translate}{'nbm_content_click_on'|@translate}<a href="{$UNSUBSCRIBE_LINK}">{$UNSUBSCRIBE_LINK}</a><br> +{'nbm_content_subscribe_link'|@translate}{'nbm_content_click_on'|@translate}<a href="{$SUBSCRIBE_LINK}">{$SUBSCRIBE_LINK}</a><br> +{'nbm_content_problem_contact'|@translate}<a href="mailto:{$CONTACT_EMAIL}?subject={'nbm_content_pb_contact_object'|@translate}">{$CONTACT_EMAIL}</a><br> +<hr><br> </p> {if not empty($recent_posts)} </div> diff --git a/template/yoga/menubar_identification.tpl b/template/yoga/menubar_identification.tpl index 32032077a..402847954 100644 --- a/template/yoga/menubar_identification.tpl +++ b/template/yoga/menubar_identification.tpl @@ -31,12 +31,12 @@ <fieldset> <legend>{'Quick connect'|@translate}</legend> <div> - <label for="username">{'Username'|@translate}</label><br/> + <label for="username">{'Username'|@translate}</label><br> <input type="text" name="username" id="username" value="" style="width:99%"> </div> <div><label for="password">{'Password'|@translate}</label> - <br/> + <br> <input type="password" name="password" id="password" style="width:99%"> </div> @@ -52,7 +52,7 @@ <ul class="actions"> <li><a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/lost_password.png" class="button" alt="{'Forgot your password?'|@translate}"></a></li> {if isset($U_REGISTER)} - <li><a href="{$U_REGISTER}" title="{'Create a new account'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/register.png" class="button" alt="{'Register'|@translate}"/></a></li> + <li><a href="{$U_REGISTER}" title="{'Create a new account'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/register.png" class="button" alt="{'Register'|@translate}"></a></li> {/if} </ul> </div> diff --git a/template/yoga/menubar_menu.tpl b/template/yoga/menubar_menu.tpl index 2600a8979..e0ba44483 100644 --- a/template/yoga/menubar_menu.tpl +++ b/template/yoga/menubar_menu.tpl @@ -3,7 +3,7 @@ {if isset($block->data.qsearch) and $block->data.qsearch==true} <form action="{$ROOT_URL}qsearch.php" method="get" id="quicksearch" onsubmit="return this.q.value!='' && this.q.value!=qsearch_prompt;"> <p style="margin:0;padding:0"{*this <p> is for html validation only - does not affect positioning*}> - <input type="text" name="q" id="qsearchInput" onfocus="if (value==qsearch_prompt) value='';" onblur="if (value=='') value=qsearch_prompt;" style="width:90%"/> + <input type="text" name="q" id="qsearchInput" onfocus="if (value==qsearch_prompt) value='';" onblur="if (value=='') value=qsearch_prompt;" style="width:90%"> </p> </form> <script type="text/javascript">var qsearch_prompt="{'qsearch'|@translate|@escape:'javascript'}"; document.getElementById('qsearchInput').value=qsearch_prompt;</script> diff --git a/template/yoga/menubar_tags.tpl b/template/yoga/menubar_tags.tpl index d7072d82d..272356564 100644 --- a/template/yoga/menubar_tags.tpl +++ b/template/yoga/menubar_tags.tpl @@ -7,7 +7,7 @@ <a href="{$tag.U_ADD}" title="{$pwg->l10n_dec('%d element are also linked to current tags', '%d elements are also linked to current tags', $tag.counter)}" rel="nofollow"> - <img src="{$ROOT_URL}{$themeconf.icon_dir}/add_tag.png" alt="+" /> + <img src="{$ROOT_URL}{$themeconf.icon_dir}/add_tag.png" alt="+"> </a> {/if} <a href="{$tag.URL}" class="tagLevel{$tag.level}" title="{'See elements linked to this tag only'|@translate}">{$tag.name}</a> diff --git a/template/yoga/month_calendar.tpl b/template/yoga/month_calendar.tpl index 8fd0eb25f..b936fd50d 100644 --- a/template/yoga/month_calendar.tpl +++ b/template/yoga/month_calendar.tpl @@ -29,7 +29,7 @@ {if !empty($chronology_calendar.calendar_bars) } {foreach from=$chronology_calendar.calendar_bars item=bar} <div class="calendarCalBar"> - <span class="calCalHead"><a href="{$bar.U_HEAD}">{$bar.HEAD_LABEL}</a> ({$bar.NB_IMAGES})</span><br/> + <span class="calCalHead"><a href="{$bar.U_HEAD}">{$bar.HEAD_LABEL}</a> ({$bar.NB_IMAGES})</span><br> {foreach from=$bar.items item=item} <span class="calCal{if !isset($item.URL)}Empty{/if}"> {if isset($item.URL)} @@ -69,7 +69,7 @@ TABLE.calMonth TBODY TD, TABLE.calMonth TBODY TD DIV.calImg {ldelim} <div class="calBackDate">{$day.DAY}</div><div class="calForeDate">{$day.DAY}</div> <div class="calImg"> <a href="{$day.U_IMG_LINK}"> - <img style="{$day.IMAGE_STYLE}" src="{$day.IMAGE}" alt="{$day.IMAGE_ALT}" title="{$pwg->l10n_dec('%d element','%d elements', $day.NB_ELEMENTS)}" /> + <img style="{$day.IMAGE_STYLE}" src="{$day.IMAGE}" alt="{$day.IMAGE_ALT}" title="{$pwg->l10n_dec('%d element','%d elements', $day.NB_ELEMENTS)}"> </a> </div> {else} diff --git a/template/yoga/nbm.tpl b/template/yoga/nbm.tpl index 7fa2845eb..3d85bf51a 100644 --- a/template/yoga/nbm.tpl +++ b/template/yoga/nbm.tpl @@ -3,7 +3,7 @@ <div id="content" class="content"> <div class="titrePage"> <ul class="categoryActions"> - <li><a href="{$U_HOME}" title="{'Go through the gallery as a visitor'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li> + <li><a href="{$U_HOME}" title="{'Go through the gallery as a visitor'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"></a></li> </ul> <h2>{'nbm_item_notification'|@translate}</h2> </div> diff --git a/template/yoga/notification.tpl b/template/yoga/notification.tpl index e7d443e77..507aa3da7 100644 --- a/template/yoga/notification.tpl +++ b/template/yoga/notification.tpl @@ -7,7 +7,7 @@ <div class="titrePage"> <ul class="categoryActions"> - <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li> + <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"></a></li> </ul> <h2>{'Notification'|@translate}</h2> </div> @@ -16,7 +16,7 @@ <dl> <dt> - <a href="{$U_FEED_IMAGE_ONLY}">{'Image only RSS feed'|@translate}</a><br /><br /> + <a href="{$U_FEED_IMAGE_ONLY}">{'Image only RSS feed'|@translate}</a><br><br> </dt> <dt> <a href="{$U_FEED}">{'Complete RSS feed'|@translate}</a> diff --git a/template/yoga/password.tpl b/template/yoga/password.tpl index 8071b16d2..78d207f49 100644 --- a/template/yoga/password.tpl +++ b/template/yoga/password.tpl @@ -3,7 +3,7 @@ <div class="titrePage"> <ul class="categoryActions"> - <li><a href="{$U_HOME}" title="{'Go through the gallery as a visitor'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li> + <li><a href="{$U_HOME}" title="{'Go through the gallery as a visitor'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"></a></li> </ul> <h2>{'Password forgotten'|@translate}</h2> </div> diff --git a/template/yoga/picture.tpl b/template/yoga/picture.tpl index b670a0388..3154bcbe7 100644 --- a/template/yoga/picture.tpl +++ b/template/yoga/picture.tpl @@ -47,7 +47,7 @@ {if isset($U_SLIDESHOW_STOP) } <a href="{$U_SLIDESHOW_STOP}" title="{'slideshow_stop'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/stop_slideshow.png" class="button" alt="{'slideshow_stop'|@translate}"></a> {/if} - <a href="{$U_METADATA}" title="{'picture_show_metadata'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/metadata.png" class="button" alt="metadata" /></a> + <a href="{$U_METADATA}" title="{'picture_show_metadata'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/metadata.png" class="button" alt="metadata"></a> {if isset($current.U_DOWNLOAD) } <a href="{$current.U_DOWNLOAD}" title="{'download_hint'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/save.png" class="button" alt="{'download'|@translate}"></a> {/if} @@ -186,9 +186,9 @@ y.callService( {foreach from=$rating.marks item=mark name=rate_loop} {if !$smarty.foreach.rate_loop.first} | {/if} {if isset($rating.USER_RATE) && $mark==$rating.USER_RATE} - <input type="button" name="rate" value="{$mark}" class="rateButtonSelected" title="{$mark}" /> + <input type="button" name="rate" value="{$mark}" class="rateButtonSelected" title="{$mark}"> {else} - <input type="submit" name="rate" value="{$mark}" class="rateButton" title="{$mark}" /> + <input type="submit" name="rate" value="{$mark}" class="rateButton" title="{$mark}"> {/if} {/foreach} <script type="text/javascript" src="{$ROOT_URL}template/{$themeconf.template}/rating.js"></script> @@ -269,7 +269,7 @@ y.callService( <label>{'upload_author'|@translate}<input type="text" name="author"></label> {/if} <label>{'comment'|@translate}<textarea name="content" id="contentid" rows="5" cols="80">{$comment_add.CONTENT}</textarea></label> - <input type="hidden" name="key" value="{$comment_add.KEY}" /> + <input type="hidden" name="key" value="{$comment_add.KEY}"> <input class="submit" type="submit" value="{'Submit'|@translate}"> </fieldset> </form> diff --git a/template/yoga/profile.tpl b/template/yoga/profile.tpl index 75ea61d48..ae9686b5a 100644 --- a/template/yoga/profile.tpl +++ b/template/yoga/profile.tpl @@ -13,7 +13,7 @@ <div class="titrePage"> <ul class="categoryActions"> - <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li> + <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"></a></li> </ul> <h2>{'Profile'|@translate}</h2> </div> diff --git a/template/yoga/profile_content.tpl b/template/yoga/profile_content.tpl index 9cabf0a51..c9bb349ad 100644 --- a/template/yoga/profile_content.tpl +++ b/template/yoga/profile_content.tpl @@ -3,7 +3,7 @@ <fieldset> <legend>{'Registration'|@translate}</legend> - <input type="hidden" name="redirect" value="{$REDIRECT}" /> + <input type="hidden" name="redirect" value="{$REDIRECT}"> <ul> <li> <span class="property">{'Username'|@translate}</span> diff --git a/template/yoga/register.tpl b/template/yoga/register.tpl index 83bfd8c27..7433b55ea 100644 --- a/template/yoga/register.tpl +++ b/template/yoga/register.tpl @@ -5,7 +5,7 @@ <div class="titrePage"> <ul class="categoryActions"> - <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li> + <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"></a></li> </ul> <h2>{'Registration'|@translate}</h2> </div> diff --git a/template/yoga/search.tpl b/template/yoga/search.tpl index 154954444..ad4c88b11 100644 --- a/template/yoga/search.tpl +++ b/template/yoga/search.tpl @@ -23,7 +23,7 @@ <div class="titrePage"> <ul class="categoryActions"> <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li> - <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}" rel="home"><img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li> + <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}" rel="home"><img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"></a></li> </ul> <h2>{'Search'|@translate}</h2> </div> @@ -42,18 +42,18 @@ <fieldset> <legend>{'Filter'|@translate}</legend> <label>{'search_keywords'|@translate} - <input type="text" style="width: 300px" name="search_allwords" size="30" /> + <input type="text" style="width: 300px" name="search_allwords" size="30"> </label> <ul> <li><label> - <input type="radio" name="mode" value="AND" checked="checked" />{'search_mode_and'|@translate} + <input type="radio" name="mode" value="AND" checked="checked">{'search_mode_and'|@translate} </label></li> <li><label> - <input type="radio" name="mode" value="OR" />{'search_mode_or'|@translate} + <input type="radio" name="mode" value="OR">{'search_mode_or'|@translate} </label></li> </ul> <label>{'search_author'|@translate} - <input type="text" style="width: 300px" name="search_author" size="30" /> + <input type="text" style="width: 300px" name="search_author" size="30"> </label> </fieldset> @@ -61,8 +61,8 @@ <fieldset> <legend>{'Search tags'|@translate}</legend> {$TAG_SELECTION} - <label><span><input type="radio" name="tag_mode" value="AND" checked="checked" /> {'All tags'|@translate}</span></label> - <label><span><input type="radio" name="tag_mode" value="OR" /> {'Any tag'|@translate}</span></label> + <label><span><input type="radio" name="tag_mode" value="AND" checked="checked"> {'All tags'|@translate}</span></label> + <label><span><input type="radio" name="tag_mode" value="OR"> {'Any tag'|@translate}</span></label> </fieldset> {/if} @@ -71,10 +71,10 @@ <ul> <li><label>{'search_date_type'|@translate}</label></li> <li><label> - <input type="radio" name="date_type" value="date_creation" checked="checked" />{'Creation date'|@translate} + <input type="radio" name="date_type" value="date_creation" checked="checked">{'Creation date'|@translate} </label></li> <li><label> - <input type="radio" name="date_type" value="date_available" />{'Post date'|@translate} + <input type="radio" name="date_type" value="date_available">{'Post date'|@translate} </label></li> </ul> <ul> @@ -90,7 +90,7 @@ {html_options options=$month_list selected=$START_MONTH_SELECTED} </select> <input id="start_year" name="start_year" type="text" size="4" maxlength="4" > - <input id="start_linked_date" name="start_linked_date" type="hidden" size="10" disabled="disabled"/> + <input id="start_linked_date" name="start_linked_date" type="hidden" size="10" disabled="disabled"> </li> <li> <a class="date_today" href="#" onClick="document.search.start_day.value={$smarty.now|date_format:"%d"};document.search.start_month.value={$smarty.now|date_format:"%m"};document.search.start_year.value={$smarty.now|date_format:"%Y"};return false;">{'today'|@translate}</a> @@ -109,7 +109,7 @@ {html_options options=$month_list selected=$END_MONTH_SELECTED} </select> <input id="end_year" name="end_year" type="text" size="4" maxlength="4" > - <input id="end_linked_date" name="end_linked_date" type="hidden" size="10" disabled="disabled"/> + <input id="end_linked_date" name="end_linked_date" type="hidden" size="10" disabled="disabled"> </li> <li> <a class="date_today" href="#" onClick="document.search.end_day.value={$smarty.now|date_format:"%d"};document.search.end_month.value={$smarty.now|date_format:"%m"};document.search.end_year.value={$smarty.now|date_format:"%Y"};return false;">{'today'|@translate}</a> @@ -127,16 +127,16 @@ <ul> <li><label>{'search_subcats_included'|@translate}</label></li> <li><label> - <input type="radio" name="subcats-included" value="1" checked="checked" />{'Yes'|@translate} + <input type="radio" name="subcats-included" value="1" checked="checked">{'Yes'|@translate} </label></li> <li><label> - <input type="radio" name="subcats-included" value="0" />{'No'|@translate} + <input type="radio" name="subcats-included" value="0">{'No'|@translate} </label></li> </ul> </fieldset> <p> - <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}" /> - <input class="submit" type="reset" value="{'Reset'|@translate}" /> + <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}"> + <input class="submit" type="reset" value="{'Reset'|@translate}"> </p> </form> diff --git a/template/yoga/tags.tpl b/template/yoga/tags.tpl index e81fe7f75..4e7b44047 100644 --- a/template/yoga/tags.tpl +++ b/template/yoga/tags.tpl @@ -4,14 +4,14 @@ <div class="titrePage"> <ul class="categoryActions"> {if $display_mode == 'letters'} - <li><a href="{$U_CLOUD}" title="{'show tag cloud'|@translate}" rel="nofollow"><img src="{$themeconf.icon_dir}/tag_cloud.png" class="button" alt="{'cloud'|@translate}"/></a></li> + <li><a href="{$U_CLOUD}" title="{'show tag cloud'|@translate}" rel="nofollow"><img src="{$themeconf.icon_dir}/tag_cloud.png" class="button" alt="{'cloud'|@translate}"></a></li> {/if} {if $display_mode == 'cloud'} - <li><a href="{$U_LETTERS}" title="{'group by letters'|@translate}" rel="nofollow"><img src="{$themeconf.icon_dir}/tag_letters.png" class="button" alt="{'letters'|@translate}"/></a></li> + <li><a href="{$U_LETTERS}" title="{'group by letters'|@translate}" rel="nofollow"><img src="{$themeconf.icon_dir}/tag_letters.png" class="button" alt="{'letters'|@translate}"></a></li> {/if} - <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li> + <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"></a></li> </ul> <h2>{'Tags'|@translate}</h2> </div> @@ -52,4 +52,4 @@ {/if} {/if} -</div> <!-- content -->
\ No newline at end of file +</div> <!-- content --> diff --git a/template/yoga/thumbnails.tpl b/template/yoga/thumbnails.tpl index 80f9d7472..01068dee8 100644 --- a/template/yoga/thumbnails.tpl +++ b/template/yoga/thumbnails.tpl @@ -7,7 +7,7 @@ <span class="wrap1"> <span class="wrap2"> <a href="{$thumbnail.URL}"> - <img class="thumbnail" src="{$thumbnail.TN_SRC}" alt="{$thumbnail.TN_ALT}" title="{$thumbnail.TN_TITLE}" /> + <img class="thumbnail" src="{$thumbnail.TN_SRC}" alt="{$thumbnail.TN_ALT}" title="{$thumbnail.TN_TITLE}"> </a> </span> <span class="thumbLegend"> @@ -15,14 +15,14 @@ {$thumbnail.ICON_TS} {if isset($thumbnail.NB_COMMENTS)} <span class="{if 0==$thumbnail.NB_COMMENTS}zero {/if}nb-comments"> - <br /> + <br> {$pwg->l10n_dec('%d comment', '%d comments',$thumbnail.NB_COMMENTS)} </span> {/if} {if isset($thumbnail.NB_HITS)} <span class="{if 0==$thumbnail.NB_HITS}zero {/if}nb-hits"> - <br /> + <br> {$pwg->l10n_dec('%d hit', '%d hits',$thumbnail.NB_HITS)} </span> {/if} diff --git a/template/yoga/upload.tpl b/template/yoga/upload.tpl index 4d2ac9d02..8c8d5fa6c 100644 --- a/template/yoga/upload.tpl +++ b/template/yoga/upload.tpl @@ -9,7 +9,7 @@ <div class="titrePage"> <ul class="categoryActions"> - <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li> + <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"></a></li> </ul> <h2>{'upload_title'|@translate}</h2> </div> @@ -41,7 +41,7 @@ </tr> <tr> <td colspan="2" align="center"> - <input class="file" name="picture" type="file" value="" /> + <input class="file" name="picture" type="file" value=""> </td> </tr> {if isset($SHOW_FORM_FIELDS) and $SHOW_FORM_FIELDS} @@ -56,35 +56,35 @@ <tr> <td>{'Username'|@translate} <span style="color:red;">*</span></td> <td> - <input name="username" type="text" value="{$NAME}" /> + <input name="username" type="text" value="{$NAME}"> </td> </tr> <!-- mail address --> <tr> <td>{'mail_address'|@translate} <span style="color:red;">*</span></td> <td> - <input name="mail_address" type="text" value="{$EMAIL}" /> + <input name="mail_address" type="text" value="{$EMAIL}"> </td> </tr> <!-- name of the picture --> <tr> <td>{'upload_name'|@translate}</td> <td> - <input name="name" type="text" value="{$NAME_IMG}" /> + <input name="name" type="text" value="{$NAME_IMG}"> </td> </tr> <!-- author --> <tr> <td>{'upload_author'|@translate}</td> <td> - <input name="author" type="text" value="{$AUTHOR_IMG}" /> + <input name="author" type="text" value="{$AUTHOR_IMG}"> </td> </tr> <!-- date of creation --> <tr> <td>{'Creation date'|@translate} (DD/MM/YYYY)</td> <td> - <input name="date_creation" type="text" value="{$DATE_IMG}" /> + <input name="date_creation" type="text" value="{$DATE_IMG}"> </td> </tr> <!-- comment --> @@ -97,13 +97,13 @@ {/if} <tr> <td colspan="2" align="center"> - <input class="submit" name="submit" type="submit" value="{'Submit'|@translate}" /> + <input class="submit" name="submit" type="submit" value="{'Submit'|@translate}"> </td> </tr> </table> </form> {else} - {'upload_successful'|@translate}<br /> + {'upload_successful'|@translate}<br> <div style="text-align:center;"> <a href="{$U_RETURN}">[ {'home'|@translate} ]</a> </div> diff --git a/tools/metadata.php b/tools/metadata.php index fa35c823f..2e9e8706a 100644 --- a/tools/metadata.php +++ b/tools/metadata.php @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ $filename = 'sample.jpg'; -echo 'Informations are read from '.$filename.'<br /><br /><br />'; +echo 'Informations are read from '.$filename.'<br><br><br>'; /** * return a cleaned IPTC value @@ -75,12 +75,12 @@ if (isset($imginfo['APP13'])) } } - echo 'IPTC Fields in '.$filename.'<br />'; + echo 'IPTC Fields in '.$filename.'<br>'; $keys = array_keys($iptc_result); sort($keys); foreach ($keys as $key) { - echo '<br />'.$key.' = '.$iptc_result[$key]; + echo '<br>'.$key.' = '.$iptc_result[$key]; } } else @@ -88,8 +88,8 @@ else echo 'no IPTC information'; } -echo '<br /><br /><br />'; -echo 'EXIF Fields in '.$filename.'<br />'; +echo '<br><br><br>'; +echo 'EXIF Fields in '.$filename.'<br>'; $exif = read_exif_data($filename); echo '<pre>'; print_r($exif); diff --git a/upload.php b/upload.php index 14380a736..3cbd1f8cd 100644 --- a/upload.php +++ b/upload.php @@ -57,7 +57,7 @@ function validate_upload( $temp_name, $my_max_file_size, $result = array(); $result['error'] = array(); - //echo $_FILES['picture']['name']."<br />".$temp_name; + //echo $_FILES['picture']['name']."<br>".$temp_name; $extension = get_extension( $_FILES['picture']['name'] ); if (!in_array($extension, $conf['picture_ext'])) { @@ -69,8 +69,8 @@ function ws_addDefaultMethods( $arr ) 'f_with_thumbnail' => array( 'default'=> false ), ), 'Returns elements for the corresponding categories. -<br/><b>cat_id</b> can be empty if <b>recursive</b> is true. Can be sent as an array. -<br/><b>order</b> comma separated fields for sorting (file,id, average_rate,...)' +<br><b>cat_id</b> can be empty if <b>recursive</b> is true. Can be sent as an array. +<br><b>order</b> comma separated fields for sorting (file,id, average_rate,...)' ); $service->addMethod('pwg.categories.getList', 'ws_categories_getList', @@ -195,7 +195,7 @@ function ws_addDefaultMethods( $arr ) ), ), 'POST method only. -<br/><b>categories</b> is a string list "category_id[,rank];category_id[,rank]" The rank is optional and is equivalent to "auto" if not given.' +<br><b>categories</b> is a string list "category_id[,rank];category_id[,rank]" The rank is optional and is equivalent to "auto" if not given.' ); $service->addMethod( @@ -258,7 +258,7 @@ function ws_addDefaultMethods( $arr ) ), ), 'POST method only. Admin only -<br/><b>categories</b> is a string list "category_id[,rank];category_id[,rank]" The rank is optional and is equivalent to "auto" if not given.' +<br><b>categories</b> is a string list "category_id[,rank];category_id[,rank]" The rank is optional and is equivalent to "auto" if not given.' ); } |