diff options
Diffstat (limited to '')
-rw-r--r-- | themes/default/template/about.tpl | 3 | ||||
-rw-r--r-- | themes/default/template/comments.tpl | 2 | ||||
-rw-r--r-- | themes/default/template/identification.tpl | 10 | ||||
-rw-r--r-- | themes/default/template/index.tpl | 2 | ||||
-rw-r--r-- | themes/default/template/infos_errors.tpl | 19 | ||||
-rw-r--r-- | themes/default/template/nbm.tpl | 20 | ||||
-rw-r--r-- | themes/default/template/notification.tpl | 2 | ||||
-rw-r--r-- | themes/default/template/password.tpl | 20 | ||||
-rw-r--r-- | themes/default/template/picture.tpl | 19 | ||||
-rw-r--r-- | themes/default/template/profile.tpl | 12 | ||||
-rw-r--r-- | themes/default/template/register.tpl | 10 | ||||
-rw-r--r-- | themes/default/template/search.tpl | 10 | ||||
-rw-r--r-- | themes/default/template/tags.tpl | 2 | ||||
-rw-r--r-- | themes/default/theme.css | 4 |
14 files changed, 40 insertions, 95 deletions
diff --git a/themes/default/template/about.tpl b/themes/default/template/about.tpl index 55f2ec830..407ca2839 100644 --- a/themes/default/template/about.tpl +++ b/themes/default/template/about.tpl @@ -8,6 +8,9 @@ </ul> <h2>{'About'|@translate}</h2> </div> + + {include file='infos_errors.tpl'} + <div id="piwigoAbout"> {$ABOUT_MESSAGE} {if isset($THEME_ABOUT) } diff --git a/themes/default/template/comments.tpl b/themes/default/template/comments.tpl index 28a0a5074..8ea49754c 100644 --- a/themes/default/template/comments.tpl +++ b/themes/default/template/comments.tpl @@ -10,6 +10,8 @@ <h2>{'User comments'|@translate}</h2> </div> +{include file='infos_errors.tpl'} + <form class="filter" action="{$F_ACTION}" method="get"> <fieldset> diff --git a/themes/default/template/identification.tpl b/themes/default/template/identification.tpl index 3deff9c54..ecdff0bb1 100644 --- a/themes/default/template/identification.tpl +++ b/themes/default/template/identification.tpl @@ -10,15 +10,7 @@ <h2>{'Identification'|@translate}</h2> </div> - {if isset($errors) } - <div class="errors"> - <ul> - {foreach from=$errors item=error} - <li>{$error}</li> - {/foreach} - </ul> - </div> - {/if} +{include file='infos_errors.tpl'} <form action="{$F_LOGIN_ACTION}" method="post" name="login_form" class="properties"> <fieldset> diff --git a/themes/default/template/index.tpl b/themes/default/template/index.tpl index 5b33c66c0..815dcbd8e 100644 --- a/themes/default/template/index.tpl +++ b/themes/default/template/index.tpl @@ -79,6 +79,8 @@ </div>{* <!-- titrePage --> *} +{include file='infos_errors.tpl'} + {if !empty($PLUGIN_INDEX_CONTENT_BEGIN)}{$PLUGIN_INDEX_CONTENT_BEGIN}{/if} {if !empty($category_search_results)} diff --git a/themes/default/template/infos_errors.tpl b/themes/default/template/infos_errors.tpl new file mode 100644 index 000000000..ce2db88d9 --- /dev/null +++ b/themes/default/template/infos_errors.tpl @@ -0,0 +1,19 @@ +{if isset($errors) } +<div class="errors"> + <ul> + {foreach from=$errors item=error} + <li>{$error}</li> + {/foreach} + </ul> +</div> +{/if} + +{if not empty($infos)} +<div class="infos"> + <ul> + {foreach from=$infos item=info} + <li>{$info}</li> + {/foreach} + </ul> +</div> +{/if}
\ No newline at end of file diff --git a/themes/default/template/nbm.tpl b/themes/default/template/nbm.tpl index 943f9cdc7..c586e9e46 100644 --- a/themes/default/template/nbm.tpl +++ b/themes/default/template/nbm.tpl @@ -9,24 +9,6 @@ <h2>{'Notification'|@translate}</h2> </div> - {if not empty($errors)} - <div class="errors"> - <ul> - {foreach from=$errors item=error} - <li>{$error}</li> - {/foreach} - </ul> - </div> - {/if} - - {if not empty($infos)} - <div class="infos"> - <ul> - {foreach from=$infos item=info} - <li>{$info}</li> - {/foreach} - </ul> - </div> - {/if} +{include file='infos_errors.tpl'} </div> diff --git a/themes/default/template/notification.tpl b/themes/default/template/notification.tpl index 935957060..2a0718f5e 100644 --- a/themes/default/template/notification.tpl +++ b/themes/default/template/notification.tpl @@ -14,6 +14,8 @@ </ul> <h2>{'Notification'|@translate}</h2> </div> + + {include file='infos_errors.tpl'} <div class="notification"> <p>{'The RSS notification feed provides notification on news from this website : new photos, updated albums, new comments. Use a RSS feed reader.'|@translate}</p> diff --git a/themes/default/template/password.tpl b/themes/default/template/password.tpl index 493e1000f..2546adea2 100644 --- a/themes/default/template/password.tpl +++ b/themes/default/template/password.tpl @@ -12,25 +12,7 @@ <h2>{$title}</h2> </div> - {if count($errors)} - <div class="errors"> - <ul> - {foreach from=$errors item=error} - <li>{$error}</li> - {/foreach} - </ul> - </div> - {/if} - - {if count($infos)} - <div class="infos"> - <ul> - {foreach from=$infos item=info} - <li>{$info}</li> - {/foreach} - </ul> - </div> - {/if} +{include file='infos_errors.tpl'} {if $action ne 'none'} <form id="lostPassword" action="{$form_action}?action={$action}{if isset($key)}&key={$key}{/if}" method="post"> diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl index acfdc95e6..7eca7e650 100644 --- a/themes/default/template/picture.tpl +++ b/themes/default/template/picture.tpl @@ -7,24 +7,7 @@ <div id="content" class="pictureContent"> {/if} -{if isset($errors)} -<div class="errors"> - <ul> - {foreach from=$errors item=error} - <li>{$error}</li> - {/foreach} - </ul> -</div> -{/if} -{if isset($infos)} -<div class="infos"> - <ul> - {foreach from=$infos item=info} - <li>{$info}</li> - {/foreach} - </ul> -</div> -{/if} +{include file='infos_errors.tpl'} {if !empty($PLUGIN_PICTURE_BEFORE)}{$PLUGIN_PICTURE_BEFORE}{/if} diff --git a/themes/default/template/profile.tpl b/themes/default/template/profile.tpl index 7870cf832..0cd94c6b8 100644 --- a/themes/default/template/profile.tpl +++ b/themes/default/template/profile.tpl @@ -1,16 +1,6 @@ {if isset($MENUBAR)}{$MENUBAR}{/if} <div id="content" class="content"> -{if isset($errors)} -<div class="errors"> - <ul> - {foreach from=$errors item=error} - <li>{$error}</li> - {/foreach} - </ul> -</div> -{/if} - <div class="titrePage"> <ul class="categoryActions"> <li><a href="{$U_HOME}" title="{'Home'|@translate}" class="pwg-state-default pwg-button"> @@ -20,5 +10,7 @@ <h2>{'Profile'|@translate}</h2> </div> +{include file='infos_errors.tpl'} + {$PROFILE_CONTENT} </div> <!-- content --> diff --git a/themes/default/template/register.tpl b/themes/default/template/register.tpl index 4530ad5bf..e1ecfffc5 100644 --- a/themes/default/template/register.tpl +++ b/themes/default/template/register.tpl @@ -12,15 +12,7 @@ <h2>{'Registration'|@translate}</h2> </div> -{if isset($errors)} - <div class="errors"> - <ul> - {foreach from=$errors item=error} - <li>{$error}</li> - {/foreach} - </ul> - </div> -{/if} +{include file='infos_errors.tpl'} <form method="post" action="{$F_ACTION}" class="properties" name="register_form"> <fieldset> diff --git a/themes/default/template/search.tpl b/themes/default/template/search.tpl index b2b83b2b7..dd40a66c1 100644 --- a/themes/default/template/search.tpl +++ b/themes/default/template/search.tpl @@ -30,15 +30,7 @@ <h2>{'Search'|@translate}</h2> </div> -{if isset($errors) } -<div class="errors"> - <ul> - {foreach from=$errors item=error} - <li>{$error}</li> - {/foreach} - </ul> -</div> -{/if} +{include file='infos_errors.tpl'} <form class="filter" method="post" name="search" action="{$F_SEARCH_ACTION}"> <fieldset> diff --git a/themes/default/template/tags.tpl b/themes/default/template/tags.tpl index 88c781142..2858ae9f3 100644 --- a/themes/default/template/tags.tpl +++ b/themes/default/template/tags.tpl @@ -20,6 +20,8 @@ <h2>{'Tags'|@translate}</h2> </div> +{include file='infos_errors.tpl'} + {if isset($tags)} {if $display_mode == 'cloud'} <div id="fullTagCloud"> diff --git a/themes/default/theme.css b/themes/default/theme.css index d8a219d89..73a2e0d20 100644 --- a/themes/default/theme.css +++ b/themes/default/theme.css @@ -734,14 +734,14 @@ INPUT[type="radio"], INPUT[type="checkbox"] { font-weight: bold; margin: 5px; border: 1px solid red; - background: #ffe1e1 url(icon/errors.png) no-repeat top right; + background: #ffe1e1 url(icon/errors.png) no-repeat center right; padding: 10px 50px 10px 10px; } /* Informations box */ .infos { color: #002000; - background: #98fb98 url(icon/infos.png) no-repeat top right; + background: #98fb98 url(icon/infos.png) no-repeat center right; margin: 5px; padding: 10px 50px 10px 10px; } |