Index: openacs-4/packages/acs-lang/www/admin/message-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-list.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-lang/www/admin/message-list.adp	3 Jul 2006 12:29:50 -0000	1.10
+++ openacs-4/packages/acs-lang/www/admin/message-list.adp	13 Aug 2007 11:13:46 -0000	1.11
@@ -1,91 +1,94 @@
-<master>
-  <property name="title">@page_title@</property>
-  <property name="context">@context;noquote@</property>
-  <div style="float: right;">
-    <formtemplate id="locale_form">
-      <table cellspacing="2" cellpadding="2" border="0">
-        <tr class="form-element"><td class="form-label">Language</td>
-        <td class="form-widget"><formwidget id="locale"></td></tr>
-        @form_vars;noquote@
-        <tr class="form-element">
-        <td align="left" colspan="2"><formwidget id="formbutton:ok"></td></tr>
-      </table>
-    </formtemplate>
-  </div>
-
-<p>
-  Show: 
-  <multiple name="show_opts">
-    <if @show_opts.rownum@ gt 1> | </if>
-    <if @show_opts.selected_p@><b>@show_opts.label@ (@show_opts.count@)</b> </if>
-    <else><a href="@show_opts.url@">@show_opts.label@ (@show_opts.count@)</a> </else>
-  </multiple>
-</p>
-
-<include src="/packages/acs-lang/lib/conflict-link" locale="@current_locale@" package_key="@package_key@"/>
-
-<ul class="action-links">
-  <if @create_p@ true>
-    <li><a href="@new_message_url@">Create new message</a></li>
-  </if>
-
-  <if @messages:rowcount@ eq 0>
-    <i>No messages</i>
-  </if>
-  <else>
-    <li><a href="@batch_edit_url@">Batch edit these messages</a></li>
-    <if @site_wide_admin_p@>
-      <li><a href="@import_messages_url@">Import messages for this package and locale from catalog files</a></li>
-      <li><a href="@export_messages_url@">Export messages for this package and locale to catalog files</a></li>
-    </if>
-  </else>
-</ul>
-
-<if @messages:rowcount@ gt 0>
-  <table cellpadding="0" cellspacing="0" border="0">
-    <tr>
-      <td style="background: #CCCCCC">
-        <table cellpadding="4" cellspacing="1" border="0">
-          <tr style="background: #FFFFe4">
-            <th></th>
-            <th>Message Key</th>
-            <th>@default_locale_label@ Message</th>
-            <if @default_locale@ ne @current_locale@>
-              <th>@locale_label@ Message</th>
-            </if>
-            <if @create_p@ true>
-              <th></th>
-            </if>
-          </tr>
-          <multiple name="messages">
-            <tr style="background: #EEEEEE">
-              <td>
-                <a href="@messages.edit_url@" title="Edit or comment on translation"><img src="/shared/images/Edit16.gif" border="0" width="16" height="16"></a>
-              </td>
-              <td>
-                <a href="@messages.edit_url@" title="Edit or comment on translation">@messages.message_key_pretty@</a>
-              </td>
-              <td>@messages.default_message@</td>
-              <if @default_locale@ ne @current_locale@>
-                <td>                  
-                  <if @messages.deleted_p@>
-                    <span style="color: red; font-style: italic;">DELETED</span> (@messages.translated_message@)
-                  </if>
-                  <else>
-                    <if @messages.translated_message@ not nil>@messages.translated_message@</if>
-                    <else><span style="color: gray; font-style: italic;">Not translated</span></else>
-                  </else>
-                </td>
-              </if>
-              <if @messages.translated_message@ not nil>
-                <td>
-                  <a href="@messages.delete_url@" title="Delete this messages"><img src="/shared/images/Delete16.gif" border="0" width="16" height="16"></a>
-                </td>
-             </if>
-            </tr>
-          </multiple>
-        </table>
-      </td>
-    </tr>
-  </table>
-</if>
+<master>
+  <property name="title">@page_title@</property>
+  <property name="context">@context;noquote@</property>
+
+<p>
+  Show: 
+  <multiple name="show_opts">
+    <if @show_opts.rownum@ gt 1> | </if>
+    <if @show_opts.selected_p@><b>@show_opts.label@ (@show_opts.count@)</b> </if>
+    <else><a href="@show_opts.url@">@show_opts.label@ (@show_opts.count@)</a> </else>
+  </multiple>
+</p>
+
+<include src="/packages/acs-lang/lib/conflict-link" locale="@current_locale@" package_key="@package_key@"/>
+
+<ul class="action-links">
+    <p /><br />
+  <if @create_p@ true>
+    <li><a href="@new_message_url@">Create new message</a></li>
+  </if>
+
+  <if @messages:rowcount@ eq 0>
+    <i>No messages</i>
+    <p /><br />
+  </if>
+  <else>
+    <li><a href="@batch_edit_url@">Batch edit these messages</a></li>
+    <if @site_wide_admin_p@>
+      <li>
+        <if @import_messages_special_url@>
+          Import messages for this package and locale from catalog files: <a href="@import_messages_url@">@import_messages_normal_text@</a>
+          &nbsp;&nbsp;<small>|&nbsp;&nbsp;[<a href="@import_messages_special_url@">@import_messages_special_text@</a>]</small>
+        </if>
+        <else>
+          <a href="@import_messages_url@">Import messages for this package and locale from catalog files</a>
+        </else>
+      </li>
+      <li><a href="@export_messages_url@">Export messages for this package and locale to catalog files</a>
+      </li>
+    </if>
+  </else>
+  <if @package_list_url@>
+    <li><a href="@package_list_url@">List all Packages in locale:</a> @locale@</li>
+  </if>
+</ul>
+<br />
+<if @messages:rowcount@ gt 0>
+  <table cellpadding="0" cellspacing="0" border="0">
+    <tr>
+      <td style="background: #CCCCCC">
+        <table cellpadding="4" cellspacing="1" border="0">
+          <tr style="background: #FFFFe4">
+            <th></th>
+            <th>Message Key</th>
+            <th>@default_locale_label@ Message</th>
+            <if @default_locale@ ne @current_locale@>
+              <th>@locale_label@ Message</th>
+            </if>
+            <if @create_p@ true>
+              <th></th>
+            </if>
+          </tr>
+          <multiple name="messages">
+            <tr style="background: #EEEEEE">
+              <td>
+                <a href="@messages.edit_url@" title="Edit or comment on translation"><img src="/shared/images/Edit16.gif" border="0" width="16" height="16"></a>
+              </td>
+              <td>
+                <a href="@messages.edit_url@" title="Edit or comment on translation">@messages.message_key_pretty@</a>
+              </td>
+              <td>@messages.default_message@</td>
+              <if @default_locale@ ne @current_locale@>
+                <td>                  
+                  <if @messages.deleted_p@>
+                    <span style="color: red; font-style: italic;">DELETED</span> (@messages.translated_message@)
+                  </if>
+                  <else>
+                    <if @messages.translated_message@ not nil>@messages.translated_message@</if>
+                    <else><span style="color: gray; font-style: italic;">Not translated</span></else>
+                  </else>
+                </td>
+              </if>
+              <if @messages.translated_message@ not nil>
+                <td>
+                  <a href="@messages.delete_url@" title="Delete this messages"><img src="/shared/images/Delete16.gif" border="0" width="16" height="16"></a>
+                </td>
+             </if>
+            </tr>
+          </multiple>
+        </table>
+      </td>
+    </tr>
+  </table>
+</if>