Changeset 14371


Ignore:
Timestamp:
Apr 24, 2012, 10:10:20 PM (8 years ago)
Author:
Eric
Message:

Bug 2572 fixed - Adding a local home icon on ConfirmMail, rejected and del_account pages
Bug 2620 fixed - Display of ConfirmMail, rejected and del_account pages have been improved

Merged from trunk to branch 2.4

Location:
extensions/UserAdvManager
Files:
2 added
14 edited

Legend:

Unmodified
Added
Removed
  • extensions/UserAdvManager/branches/2.40/ConfirmMail.php

    r12271 r14371  
    8787   
    8888    $redirect = true;
     89    $Path_UAM = UAM_PATH; // Path to be used in template to reach the icons
    8990   
    9091    $template->assign(
    9192                        array(
     93        'UAM_PATH'             => $Path_UAM,
    9294        'REDIRECT'             => $redirect,
    9395        'STATUS'               => $status,
  • extensions/UserAdvManager/branches/2.40/GT_del_account.php

    r12271 r14371  
    3636  else $custom_text = l10n(preg_replace($patterns, $replacements, $conf_UAM[23]));
    3737}
    38    
     38
     39$Path_UAM = UAM_PATH; // Path to be used in template to reach the icons
     40
    3941$template->assign(
    4042  array(
     43    'UAM_PATH'             => $Path_UAM,
    4144    'GALLERY_URL'          => make_index_url(),
    4245    'CUSTOM_REDIR_MSG'     => $custom_text,
  • extensions/UserAdvManager/branches/2.40/changelog.txt.php

    r14366 r14371  
    299299-- 2.40.0 : Bug 2570 fixed - Adding Wiki link to complete plugin documentation (FR only)
    300300            Bug 2571 fixed - Piwigo 2.4 compliance : Information email removed on user registration because already managed by Piwigo
     301            Bug 2572 fixed - Adding a local home icon on ConfirmMail, rejected and del_account pages
    301302            Bug 2591 fixed - Excluding Adult_Content generic users from users tracking list
    302303            Bug 2603 fixed - Php notice when user changes his email in his profile if confirmation by email is set
    303304            Bug 2619 fixed - Confirmation email when registered user changes his email was not sent and user not demoted
     305            Bug 2620 fixed - Display of ConfirmMail, rejected and del_account pages have been improved
    304306*/
    305307?>
  • extensions/UserAdvManager/branches/2.40/rejected.php

    r13121 r14371  
    3636  else $custom_text = l10n(preg_replace($patterns, $replacements, $conf_UAM[40]));
    3737}
    38    
     38
     39$Path_UAM = UAM_PATH; // Path to be used in template to reach the icons
     40
    3941$template->assign(
    4042  array(
     43    'UAM_PATH'             => $Path_UAM,
    4144    'GALLERY_URL'          => make_index_url(),
    4245    'CUSTOM_REJECT_MSG'    => $custom_text,
  • extensions/UserAdvManager/branches/2.40/template/ConfirmMail.tpl

    r9177 r14371  
    11{html_head}<link rel="stylesheet" type="text/css" href="template/confmail.css">{/html_head}
    22
    3 <div id="content" class="content">
    4   <div class="titrePage">
    5     <ul class="categoryActions">
    6       <li>
     3<div class="titrePage">
     4  <ul class="categoryActions">
     5    <li>
    76    {if $REDIRECT}
    8         <a href="{$ROOT_URL}identification.php" title="{'return to homepage'|@translate}">
    9           <img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}">
    10         </a>
     7      <a href="{$ROOT_URL}identification.php" title="{'return to homepage'|@translate}">
     8        <img src="{$UAM_PATH}template/icon/home.png" class="button" alt="{'home'|@translate}">
     9      </a>
    1110    {else}
    12         <a href="{$GALLERY_URL}" title="{'return to homepage'|@translate}">
    13           <img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}">
    14         </a>
     11      <a href="{$GALLERY_URL}" title="{'return to homepage'|@translate}">
     12        <img src="{$UAM_PATH}template/icon/home.png" class="button" alt="{'home'|@translate}">
     13      </a>
    1514    {/if}
    16       </li>
    17     </ul>
    18     <h2 class="confmail">{'UAM_title_confirm_mail'|@translate}</h2>
    19   </div>
    20   <ul>
    21   {if $STATUS == true}
    22     <div class="infos">{$CONFIRM_MAIL_MESSAGE}</div>
    23   {elseif $STATUS == false}
    24     <div class="errors">{$CONFIRM_MAIL_MESSAGE}</div>
    25   {/if}
     15    </li>
    2616  </ul>
     17  <h2 class="confmail">{'UAM_title_confirm_mail'|@translate}</h2>
    2718</div>
     19
     20<ul>
     21{if $STATUS == true}
     22  <div class="infos">{$CONFIRM_MAIL_MESSAGE}</div>
     23{elseif $STATUS == false}
     24  <div class="errors">{$CONFIRM_MAIL_MESSAGE}</div>
     25{/if}
     26</ul>
  • extensions/UserAdvManager/branches/2.40/template/del_account.tpl

    r9177 r14371  
    11{html_head}<link rel="stylesheet" type="text/css" href="template/confmail.css">{/html_head}
    22
    3 <div id="content" class="content">
    4   <div class="titrePage">
    5     <ul class="categoryActions">
    6       <li>
    7         <a href="{$GALLERY_URL}" title="{'return to homepage'|@translate}">
    8           <img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}">
    9         </a>
    10       </li>
    11     </ul>
    12     <h2 class="confmail">{'UAM_title_redir_page'|@translate}</h2>
    13   </div>
    14   <ul>
    15     <div class="errors">{$CUSTOM_REDIR_MSG}</div>
     3<div class="titrePage">
     4  <ul class="categoryActions">
     5    <li>
     6      <a href="{$GALLERY_URL}" title="{'return to homepage'|@translate}">
     7        <img src="{$UAM_PATH}template/icon/home.png" class="button" alt="{'home'|@translate}">
     8      </a>
     9    </li>
    1610  </ul>
     11  <h2 class="confmail">{'UAM_title_redir_page'|@translate}</h2>
    1712</div>
     13
     14<ul>
     15  <div class="errors">{$CUSTOM_REDIR_MSG}</div>
     16</ul>
  • extensions/UserAdvManager/branches/2.40/template/rejected.tpl

    r13121 r14371  
    11{html_head}<link rel="stylesheet" type="text/css" href="template/confmail.css">{/html_head}
    22
    3 <div id="content" class="content">
    4   <div class="titrePage">
    5     <ul class="categoryActions">
    6       <li>
    7         <a href="{$GALLERY_URL}" title="{'return to homepage'|@translate}">
    8           <img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}">
    9         </a>
    10       </li>
    11     </ul>
    12     <h2 class="confmail">{'UAM_Reject_Page_Title'|@translate}</h2>
    13   </div>
    14   <ul>
    15     <div class="errors">{$CUSTOM_REJECT_MSG}</div>
     3<div class="titrePage">
     4  <ul class="categoryActions">
     5    <li>
     6      <a href="{$GALLERY_URL}" title="{'return to homepage'|@translate}">
     7        <img src="{$UAM_PATH}template/icon/home.png" class="button" alt="{'home'|@translate}">
     8      </a>
     9    </li>
    1610  </ul>
     11  <h2 class="confmail">{'UAM_Reject_Page_Title'|@translate}</h2>
    1712</div>
     13
     14<ul>
     15  <div class="errors">{$CUSTOM_REJECT_MSG}</div>
     16</ul>
  • extensions/UserAdvManager/trunk/ConfirmMail.php

    r12271 r14371  
    8787   
    8888    $redirect = true;
     89    $Path_UAM = UAM_PATH; // Path to be used in template to reach the icons
    8990   
    9091    $template->assign(
    9192                        array(
     93        'UAM_PATH'             => $Path_UAM,
    9294        'REDIRECT'             => $redirect,
    9395        'STATUS'               => $status,
  • extensions/UserAdvManager/trunk/GT_del_account.php

    r12271 r14371  
    3636  else $custom_text = l10n(preg_replace($patterns, $replacements, $conf_UAM[23]));
    3737}
    38    
     38
     39$Path_UAM = UAM_PATH; // Path to be used in template to reach the icons
     40
    3941$template->assign(
    4042  array(
     43    'UAM_PATH'             => $Path_UAM,
    4144    'GALLERY_URL'          => make_index_url(),
    4245    'CUSTOM_REDIR_MSG'     => $custom_text,
  • extensions/UserAdvManager/trunk/changelog.txt.php

    r14366 r14371  
    299299-- 2.40.0 : Bug 2570 fixed - Adding Wiki link to complete plugin documentation (FR only)
    300300            Bug 2571 fixed - Piwigo 2.4 compliance : Information email removed on user registration because already managed by Piwigo
     301            Bug 2572 fixed - Adding a local home icon on ConfirmMail, rejected and del_account pages
    301302            Bug 2591 fixed - Excluding Adult_Content generic users from users tracking list
    302303            Bug 2603 fixed - Php notice when user changes his email in his profile if confirmation by email is set
    303304            Bug 2619 fixed - Confirmation email when registered user changes his email was not sent and user not demoted
     305            Bug 2620 fixed - Display of ConfirmMail, rejected and del_account pages have been improved
    304306*/
    305307?>
  • extensions/UserAdvManager/trunk/rejected.php

    r13121 r14371  
    3636  else $custom_text = l10n(preg_replace($patterns, $replacements, $conf_UAM[40]));
    3737}
    38    
     38
     39$Path_UAM = UAM_PATH; // Path to be used in template to reach the icons
     40
    3941$template->assign(
    4042  array(
     43    'UAM_PATH'             => $Path_UAM,
    4144    'GALLERY_URL'          => make_index_url(),
    4245    'CUSTOM_REJECT_MSG'    => $custom_text,
  • extensions/UserAdvManager/trunk/template/ConfirmMail.tpl

    r9177 r14371  
    11{html_head}<link rel="stylesheet" type="text/css" href="template/confmail.css">{/html_head}
    22
    3 <div id="content" class="content">
    4   <div class="titrePage">
    5     <ul class="categoryActions">
    6       <li>
     3<div class="titrePage">
     4  <ul class="categoryActions">
     5    <li>
    76    {if $REDIRECT}
    8         <a href="{$ROOT_URL}identification.php" title="{'return to homepage'|@translate}">
    9           <img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}">
    10         </a>
     7      <a href="{$ROOT_URL}identification.php" title="{'return to homepage'|@translate}">
     8        <img src="{$UAM_PATH}template/icon/home.png" class="button" alt="{'home'|@translate}">
     9      </a>
    1110    {else}
    12         <a href="{$GALLERY_URL}" title="{'return to homepage'|@translate}">
    13           <img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}">
    14         </a>
     11      <a href="{$GALLERY_URL}" title="{'return to homepage'|@translate}">
     12        <img src="{$UAM_PATH}template/icon/home.png" class="button" alt="{'home'|@translate}">
     13      </a>
    1514    {/if}
    16       </li>
    17     </ul>
    18     <h2 class="confmail">{'UAM_title_confirm_mail'|@translate}</h2>
    19   </div>
    20   <ul>
    21   {if $STATUS == true}
    22     <div class="infos">{$CONFIRM_MAIL_MESSAGE}</div>
    23   {elseif $STATUS == false}
    24     <div class="errors">{$CONFIRM_MAIL_MESSAGE}</div>
    25   {/if}
     15    </li>
    2616  </ul>
     17  <h2 class="confmail">{'UAM_title_confirm_mail'|@translate}</h2>
    2718</div>
     19
     20<ul>
     21{if $STATUS == true}
     22  <div class="infos">{$CONFIRM_MAIL_MESSAGE}</div>
     23{elseif $STATUS == false}
     24  <div class="errors">{$CONFIRM_MAIL_MESSAGE}</div>
     25{/if}
     26</ul>
  • extensions/UserAdvManager/trunk/template/del_account.tpl

    r9177 r14371  
    11{html_head}<link rel="stylesheet" type="text/css" href="template/confmail.css">{/html_head}
    22
    3 <div id="content" class="content">
    4   <div class="titrePage">
    5     <ul class="categoryActions">
    6       <li>
    7         <a href="{$GALLERY_URL}" title="{'return to homepage'|@translate}">
    8           <img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}">
    9         </a>
    10       </li>
    11     </ul>
    12     <h2 class="confmail">{'UAM_title_redir_page'|@translate}</h2>
    13   </div>
    14   <ul>
    15     <div class="errors">{$CUSTOM_REDIR_MSG}</div>
     3<div class="titrePage">
     4  <ul class="categoryActions">
     5    <li>
     6      <a href="{$GALLERY_URL}" title="{'return to homepage'|@translate}">
     7        <img src="{$UAM_PATH}template/icon/home.png" class="button" alt="{'home'|@translate}">
     8      </a>
     9    </li>
    1610  </ul>
     11  <h2 class="confmail">{'UAM_title_redir_page'|@translate}</h2>
    1712</div>
     13
     14<ul>
     15  <div class="errors">{$CUSTOM_REDIR_MSG}</div>
     16</ul>
  • extensions/UserAdvManager/trunk/template/rejected.tpl

    r13121 r14371  
    11{html_head}<link rel="stylesheet" type="text/css" href="template/confmail.css">{/html_head}
    22
    3 <div id="content" class="content">
    4   <div class="titrePage">
    5     <ul class="categoryActions">
    6       <li>
    7         <a href="{$GALLERY_URL}" title="{'return to homepage'|@translate}">
    8           <img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}">
    9         </a>
    10       </li>
    11     </ul>
    12     <h2 class="confmail">{'UAM_Reject_Page_Title'|@translate}</h2>
    13   </div>
    14   <ul>
    15     <div class="errors">{$CUSTOM_REJECT_MSG}</div>
     3<div class="titrePage">
     4  <ul class="categoryActions">
     5    <li>
     6      <a href="{$GALLERY_URL}" title="{'return to homepage'|@translate}">
     7        <img src="{$UAM_PATH}template/icon/home.png" class="button" alt="{'home'|@translate}">
     8      </a>
     9    </li>
    1610  </ul>
     11  <h2 class="confmail">{'UAM_Reject_Page_Title'|@translate}</h2>
    1712</div>
     13
     14<ul>
     15  <div class="errors">{$CUSTOM_REJECT_MSG}</div>
     16</ul>
Note: See TracChangeset for help on using the changeset viewer.