hectorr
committed
on 17 Jul 19
Renaming of files so they are loaded after 00-icanuse-procs.tcl
openacs-4/.../www/users/merge.adp (+3 -3)
1 1   <master>
2 2     <property name="doc(title)">Merge account system</property>
3 3     <property name="context">@context;literal@</property>
4 4
5 5     <h2>User Account Merge</h2>
6 6    
7       This is the user acccount merge wizard. You selected these accounts to merge:
  7     This is the user account merge wizard. You selected these accounts to merge:
8 8     <p/>
9 9       <table align="center">
10 10         <tr>
11 11           <td valign="top">
12 12             <table style="background-color:#006666;border-width:2px;">
13 13               <tr>
14 14                 <td>
15 15                   <table style="background-color:#D1FFFF">
16 16                     <tr>
17 17                       <td>
18 18                         <center>
19 19                         <strong>ACCOUNT ONE</strong>
20 20                           <p/>
21 21                           <img style="border:2" width="80" height="80" src="@one_img_src@" alt="Portrait of @user_id@">
22 22                             <h3>General Information of user one (<strong>@one_email@</strong>):</h3>
23 23                         </center>
24 24                         <ul>
25 25                           <li>
26 26                             Name:
27 27                             <em>@one_first_names@ @one_last_name@</em>
28 28                           </li>
29 29                           <li>
30 30                             Email:
31 31                             <strong><a href="mailto:@one_email@">@one_email@</a></strong>
32 32                           </li>
33 33                           <li>
34                               Scren name:
  34                             Screen name:
35 35                             <strong>@one_screen_name@</strong>
36 36                           </li>
37 37                           <li>
38 38                             Username:
39 39                             <strong>@one_username@</strong>
40 40                           </li>
41 41                           <li>
42 42                             User id:
43 43                             @user_id@
44 44                           </li>
45 45                           <li>
46 46                             URL:
47 47                             @one_url@
48 48                           </li>
49 49                           <li>
50 50                             Registration date:
51 51                             @one_creation_date@
52 52                           </li>
53 53                           <li>
54 54                             Registration IP:
 
143 143                 <td>
144 144                   <table style="background-color:#FFE3B9">
145 145                     <tr>
146 146                       <td>
147 147                         <center>
148 148                           <strong>ACCOUNT TWO</strong>
149 149                           <p/>
150 150                             <img style="border:2" width="80" height="80" src="@two_img_src@" alt="Portrait of @user_id_from_search@">
151 151                             <h3>General Information of user two (<strong>@two_email@</strong>):</h3>
152 152                         </center>
153 153                         <ul>
154 154                           <li>
155 155                             Name:
156 156                             <em>@two_first_names@ @two_last_name@</em>
157 157                           </li>
158 158                           <li>
159 159                             Email:
160 160                             <strong><a href="mailto:@two_email@">@two_email@</a></strong>
161 161                           </li>
162 162                           <li>
163                               Scren name:
  163                             Screen name:
164 164                             <strong>@two_screen_name@</strong>
165 165                           </li>
166 166                           <li>
167 167                             Username:
168 168                             <strong>@two_username@</strong>
169 169                           </li>
170 170                           <li>
171 171                             User id:
172 172                             @user_id_from_search@
173 173                           </li>
174 174                           <li>
175 175                             URL:
176 176                             @two_url@
177 177                           </li>
178 178                           <li>
179 179                             Registration date:
180 180                             @two_creation_date@
181 181                           </li>
182 182                           <li>
183 183                             Registration IP: