UPD: visual restructure of my details names form

Change-Id: I3e1db2d2210ccc1642a6fea7eae9f573d4901209

diff --git a/src/org/cacert/gigi/output/NameInput.templ b/src/org/cacert/gigi/output/NameInput.templ
index 2cb11fc7423a61fb10ac35e02506e13adb2eaf13..b633daa355f9fb41b16053abde0294c04ede0473 100644 (file)
--- a/src/org/cacert/gigi/output/NameInput.templ
+++ b/src/org/cacert/gigi/output/NameInput.templ
@@ -7,11 +7,16 @@
 <li><?=_The first Last Name is mandatory, any other ones may be omitted, but must stay in sequence.?></li>
 <li><?=_Any Suffixes may be omitted, but must stay in sequence.?></li>
 </ul>
-<div>
+<div class="form-group">
 <input type='text' name='fname' class="form-control" placeholder="<?=_First Names?>" value="<?=$fname?>">
+</div>
+<div class="form-group">
 <input type='text' name='lname' class="form-control" placeholder="<?=_Last Names?>" value="<?=$lname?>">
+</div>
+<div class="form-group">
 <input type='text' name='suffix' class="form-control" placeholder="<?=_Suffixes?>" value="<?=$suffix?>">
 </div>
+
 <h3><?=_Single Name?></h3>
 <h4><?=_Structure?></h4>
 <?=_Name of one part?>
@@ -19,6 +24,6 @@
 <ul>
 <li><?=_Name has no variants?></li>
 </ul>
-<div>
+<div class="form-group">
 <input type='text' name='name' class="form-control" placeholder="<?=_Name?>" value="<?=$name?>">
-</div>
\ No newline at end of file
+</div>

diff --git a/src/org/cacert/gigi/pages/account/MyDetailsForm.templ b/src/org/cacert/gigi/pages/account/MyDetailsForm.templ
index f9ea0c7244dea6318741f4bb331356878dea68ee..fe0bcfb173a8cbaeeb85a664f98379d2e7fad13a 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MyDetailsForm.templ
+++ b/src/org/cacert/gigi/pages/account/MyDetailsForm.templ
@@ -1,3 +1,10 @@
+<div class="panel panel-default">
+  <div class="panel-heading"><?=_Date of Birth?></div>
+  <div class="panel-body">
+   <?=$DoB?>
+  </div>
+</div>
+
 <table class="table">
   <tbody>
   <tr>

diff --git a/src/org/cacert/gigi/pages/account/NamesForm.templ b/src/org/cacert/gigi/pages/account/NamesForm.templ
index 1ca468de24a50342dcf2f1628898e7fa2daa6b29..b38b71790b37697d4d2fefb5e7b73ca626f2f3d7 100644 (file)
--- a/src/org/cacert/gigi/pages/account/NamesForm.templ
+++ b/src/org/cacert/gigi/pages/account/NamesForm.templ
@@ -1,8 +1,14 @@
-<table class="table">
-  <tbody>
+<div class="panel panel-default">
+  <div class="panel-heading">
+    <h3 class="panel-title"><?=_Names?></h3>
+  </div>
+  <table class="table">
+  <tr>
+    <th>Name</th>
+    <th><?=_Points?></th>
+    <th colspan="3"></th>
   <? foreach($exNames) { ?>
   <tr>
-    <td><?=_Name?>: </td>
     <td><?=$name?></td>
     <td><?=$npoints?></td>
     <td><button class="btn btn-warning" name="deprecateName" value="<?=$id?>" type="submit"<?=$deprecated?>><?=_Deprecate Name?></button></td>
@@ -10,10 +16,18 @@
     <td><button class="btn btn-primary" name="preferred" value="<?=$id?>" type="submit"<?=$preferred?>><?=_Set as Preferred?></button></td>
   </tr>
   <? } ?>
-  <tr>
-    <td><?=_Name?>: </td>
-    <td colspan="5"><?=$name?>
-    <button class="btn btn-primary" name="action" value="addName" type="submit"><?=_Add Name?></button></td>
-  </tr>
-  </tbody>
-</table>
+  </table>
+</div>
+
+<div class="panel panel-default">
+  <div class="panel-heading">
+    <h3 class="panel-title"><?=_New name?></h3>
+  </div>
+   <div class="panel-body">
+    <?=$name?>
+    <div class="clearfix"></div>
+    <div class="form-group">
+    <button class="btn btn-primary pull-right" name="action" value="addName" type="submit"><?=_Add Name?></button>
+    </div>
+  </div>
+</div>