[Mpuls-commits] r6164 - wasko/trunk/waskoweb/templates/settings

[scm-commit at wald.intevation.org]

Author: ludwig
Date: 2013-01-17 12:09:28 +0100 (Thu, 17 Jan 2013)
New Revision: 6164

Modified:
   wasko/trunk/waskoweb/templates/settings/edit.mako
   wasko/trunk/waskoweb/templates/settings/show.mako
Log:
Change meta user configuration.


Modified: wasko/trunk/waskoweb/templates/settings/edit.mako
===================================================================
--- wasko/trunk/waskoweb/templates/settings/edit.mako	2013-01-03 10:23:04 UTC (rev 6163)
+++ wasko/trunk/waskoweb/templates/settings/edit.mako	2013-01-17 11:09:28 UTC (rev 6164)
@@ -109,21 +109,13 @@
 
 
       % if g.mpuls_config.is_enabled('case-module', 'meta-server'):
-      <fieldset>
-        <legend>${_('Edit meta user settings')}</legend>
-        <div class="waska_form_element w30">
-          <label for="meta_user_name">
-            ${_('Meta user name')}
-          </label>
-          <input type="text" id="meta_user_name" name="meta_user_name" value="" maxlength="120"/>
-        </div>
-        <div class="waska_form_element w30">
-          <label for="meta_user_password">
-            ${_('Meta user password')}
-          </label>
-          <input type="text" id="meta_user_password" name="meta_user_password" value="" maxlength="120"/>
-        </div>
-      </fieldset>
+        <fieldset><legend>${_('Meta connection')}</legend>
+  	% if c.agency.getMetaUserName() and c.agency.getMetaUserPassword():
+	  <div>${_('Meta connection is enabled')}</div>
+	% else:
+	  <div>${_('Meta connection is not enabled')}</div>
+	% endif
+        </fieldset>
       % endif
       <div id="admin_edit_settings_submit" class="waska_form_element w100">
         <input type="submit" value="${_('Save settings')}">

Modified: wasko/trunk/waskoweb/templates/settings/show.mako
===================================================================
--- wasko/trunk/waskoweb/templates/settings/show.mako	2013-01-03 10:23:04 UTC (rev 6163)
+++ wasko/trunk/waskoweb/templates/settings/show.mako	2013-01-17 11:09:28 UTC (rev 6164)
@@ -83,21 +83,10 @@
 
 
 % if g.mpuls_config.is_enabled('case-module', 'meta-server'):
-<p>${_('Here you can see meta user settings')}</p>
-<table>
-  <tr>
-    <td class="label table_header_v table_width_name">
-      ${_('Name of the meta user')}
-    </td>
-    <td class="table_description">${c.agency.getMetaUserName()}
-    </td>
-  </tr>
-  <tr>
-    <td class="label table_width_name">
-      ${_('Password of the meta user')}
-    </td>
-    <td class="table_description">${c.agency.getMetaUserPassword()}
-    </td>
-  </tr>
-</table>
+<p>${_('Meta connection')}</p>
+% if c.agency.getMetaUserName() and c.agency.getMetaUserPassword():
+  <div>${_('Meta connection is enabled')}</div>
+% else:
+  <div>${_('Meta connection is not enabled')}</div>
 % endif
+% endif