upd: use bootstrap class for button

Change-Id: I3c5fbaf271efa791f16860a69c53d22496f4674a

diff --git a/src/org/cacert/gigi/pages/account/MyOrganisationsForm.templ b/src/org/cacert/gigi/pages/account/MyOrganisationsForm.templ
index c0eb939d7419bf56c73e6e972452ec87329ebdf4..96d7bbe722b7faacc512a9234aab5e576fb835ed 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MyOrganisationsForm.templ
+++ b/src/org/cacert/gigi/pages/account/MyOrganisationsForm.templ
@@ -2,9 +2,9 @@
 <h2><?=_My Organisations?></h2>
 <table class="table">
 <? foreach($orgas) { ?>
 <h2><?=_My Organisations?></h2>
 <table class="table">
 <? foreach($orgas) { ?>

-<tr><td><?=$orgName?></td><td><?=$orgID?></td><td><input type='submit' value='<?=_switch to this organisation?>' name='org:<?=$orgID?>'/></td></tr>
+<tr><td><?=$orgName?></td><td><?=$orgID?></td><td><input class="btn btn-info" type='submit' value='<?=_switch to this organisation?>' name='org:<?=$orgID?>'/></td></tr>

 <? } ?>
 </table>
 <? if($personal) { ?>
 <? } ?>
 </table>
 <? if($personal) { ?>

-<input type='submit' value='<?=_switch back to personal use?>' name='org-leave'/>
+<input class="btn btn-primary" type='submit' value='<?=_switch back to personal use?>' name='org-leave'/>

 <? } ?>
 <? } ?>

diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ
index 7fd6cf23a071ab558853d7766d25063a4fe1c411..e9947a970569f7b36c19bed74b1b5472537e566d 100644 (file)
--- a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ
+++ b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ
@@ -83,7 +83,7 @@
   </tr>
 
   <tr>
   </tr>
 
   <tr>

-    <td colspan="2"><input type="submit" name="process" value="<?=_Issue Certificate?>" /></td>
+    <td colspan="2"><input class="btn btn-primary" type="submit" name="process" value="<?=_Issue Certificate?>" /></td>

   </tr>
   </tbody>
 </table>
   </tr>
   </tbody>
 </table>

diff --git a/src/org/cacert/gigi/pages/account/certs/RequestCertificate.templ b/src/org/cacert/gigi/pages/account/certs/RequestCertificate.templ
index 5139a695c235017855c9ad704f8858bca03c4123..9ffd5da646ffaf179e69a9165aa9277a33439c61 100644 (file)
--- a/src/org/cacert/gigi/pages/account/certs/RequestCertificate.templ
+++ b/src/org/cacert/gigi/pages/account/certs/RequestCertificate.templ
@@ -14,7 +14,7 @@
   </tr>
   <tr>
     <td colspan="2">
   </tr>
   <tr>
     <td colspan="2">

-      <input type="submit" name="process" value="<?=_Next?>" />
+      <input class="btn btn-primary" type="submit" name="process" value="<?=_Next?>" />

       <input type='hidden' name='<?=$csrf_name?>' value='<?=$csrf?>'>
     </td>
   </tr>
       <input type='hidden' name='<?=$csrf_name?>' value='<?=$csrf?>'>
     </td>
   </tr>


@@ -38,7 +38,7 @@
   </tr>
   <tr>
     <td colspan="2">
   </tr>
   <tr>
     <td colspan="2">

-     <input type="submit" name="process" value="<?=_Next?>" />
+     <input class="btn btn-primary" type="submit" name="process" value="<?=_Next?>" />

      <input type='hidden' name='<?=$csrf_name?>' value='<?=$csrf?>'>
     </td>
   </tr>
      <input type='hidden' name='<?=$csrf_name?>' value='<?=$csrf?>'>
     </td>
   </tr>

diff --git a/src/org/cacert/gigi/pages/account/mail/MailAddForm.templ b/src/org/cacert/gigi/pages/account/mail/MailAddForm.templ
index 3132586058f58eef8b48202141a8e958c702a7e4..c709391a9407b0bae20050e650c56322bb7da412 100644 (file)
--- a/src/org/cacert/gigi/pages/account/mail/MailAddForm.templ
+++ b/src/org/cacert/gigi/pages/account/mail/MailAddForm.templ
@@ -4,6 +4,6 @@
     <td><input class="form-control" type="text" name="newemail" value="" required></td>
   </tr>
   <tr>
     <td><input class="form-control" type="text" name="newemail" value="" required></td>
   </tr>
   <tr>

-    <td colspan="2"><input type="submit" name="addmail" value="<?=_I own or am authorised to control this email address?>"></td>
+    <td colspan="2"><input class="btn btn-primary" type="submit" name="addmail" value="<?=_I own or am authorised to control this email address?>"></td>

   </tr>
 </table>
   </tr>
 </table>

diff --git a/src/org/cacert/gigi/pages/admin/TTPAdminForm.templ b/src/org/cacert/gigi/pages/admin/TTPAdminForm.templ
index a3fd9f22ec0f443b7ac473223ed9f3bfcceb36b9..4bf3ce76d8bbc638794de2c19500ec85bde78793 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/TTPAdminForm.templ
+++ b/src/org/cacert/gigi/pages/admin/TTPAdminForm.templ
@@ -3,5 +3,5 @@
 <tr><td><?=_Name?></td><td><?=$name?></td></tr>
 <tr><td><?=_Email?></td><td><?=$email?></td></tr>
 <tr><td><?=_Date of Birth?></td><td><?=$DoB?></td></tr>
 <tr><td><?=_Name?></td><td><?=$name?></td></tr>
 <tr><td><?=_Email?></td><td><?=$email?></td></tr>
 <tr><td><?=_Date of Birth?></td><td><?=$DoB?></td></tr>

-<tr><td colspan="2"><input type="submit" name="deny" value="<?=_Deny Request?>"></td></tr>
+<tr><td colspan="2"><input class="btn btn-warning" type="submit" name="deny" value="<?=_Deny Request?>"></td></tr>

 </table>
\ No newline at end of file
 </table>
\ No newline at end of file

diff --git a/src/org/cacert/gigi/pages/admin/support/FindUserByDomainForm.templ b/src/org/cacert/gigi/pages/admin/support/FindUserByDomainForm.templ
index 2a5a8523f1ba8a6ee8014e7c0ae5eee02ab02c73..6460541a49610cb22792e8caa4ffe854462b3584 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/support/FindUserByDomainForm.templ
+++ b/src/org/cacert/gigi/pages/admin/support/FindUserByDomainForm.templ
@@ -7,7 +7,7 @@
     <td><input class="form-control" type="text" value="" name="domain" placeholder="<?=_For search by ID use # prefix e.g. #123456?>" required></td>
   </tr>
   <tr>
     <td><input class="form-control" type="text" value="" name="domain" placeholder="<?=_For search by ID use # prefix e.g. #123456?>" required></td>
   </tr>
   <tr>

-    <td colspan="2"><input type="submit" value="<?=_Next?>" name="process"></td>
+    <td colspan="2"><input class="btn btn-primary" type="submit" value="<?=_Next?>" name="process"></td>

   </tr>
 </tbody>
 </table>
   </tr>
 </tbody>
 </table>

diff --git a/src/org/cacert/gigi/pages/admin/support/FindUserByEmailForm.templ b/src/org/cacert/gigi/pages/admin/support/FindUserByEmailForm.templ
index 90a627e33bf9f060d54fc621f84144c16e399768..b3c8bb96190dc5b31c3ed66810ec66ff4e4d3253 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/support/FindUserByEmailForm.templ
+++ b/src/org/cacert/gigi/pages/admin/support/FindUserByEmailForm.templ
@@ -7,6 +7,6 @@
     <td><input class="form-control" name="email" value="" size="30" title="<?=_use % as wildcard?>" placeholder="<?=_use % as wildcard?>" type="text" required/></td>
   </tr>
   <tr>
     <td><input class="form-control" name="email" value="" size="30" title="<?=_use % as wildcard?>" placeholder="<?=_use % as wildcard?>" type="text" required/></td>
   </tr>
   <tr>

-    <td colspan="2"><input name="process" value="<?=_Next?>" type="submit"/></td>
+    <td colspan="2"><input class="btn btn-primary" name="process" value="<?=_Next?>" type="submit"/></td>

   </tr>
 </tbody></table>
   </tr>
 </tbody></table>

diff --git a/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.templ b/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.templ
index 27b901b43a48787dfbacad61bf51c77ee210033e..73e918278bc1621d3475564c41f86a8be103cdfc 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.templ
+++ b/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.templ
@@ -7,11 +7,11 @@
             <td><input type="text" class="form-control" <? if($ticketNo) {?>value="<?=$ticketNo?>" <? } ?>name="ticketno" required></td>
         </tr>
         <tr>
             <td><input type="text" class="form-control" <? if($ticketNo) {?>value="<?=$ticketNo?>" <? } ?>name="ticketno" required></td>
         </tr>
         <tr>

-            <td colspan="2"><input type="submit" name="setTicket" value="<?=_Set ticket number?>"></td>
+            <td colspan="2"><input class="btn btn-primary" type="submit" name="setTicket" value="<?=_Set ticket number?>"></td>

         </tr>
 <? if($ticketNo) {?>
         <tr>
         </tr>
 <? if($ticketNo) {?>
         <tr>

-            <td colspan="2"><input type="submit" name="deleteTicket" value="<?=_End working on ticket?>"></td>
+            <td colspan="2"><input class="btn btn-warning" type="submit" name="deleteTicket" value="<?=_End working on ticket?>"></td>

         </tr>
 <? } ?>
 </table>
\ No newline at end of file
         </tr>
 <? } ?>
 </table>
\ No newline at end of file

diff --git a/src/org/cacert/gigi/pages/admin/support/SupportRevokeCertificatesForm.templ b/src/org/cacert/gigi/pages/admin/support/SupportRevokeCertificatesForm.templ
index db141cda6c0d7af53ac3ae043102610ee9113ccc..1cc4de345f124627261165b7988d7966a144aff7 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/support/SupportRevokeCertificatesForm.templ
+++ b/src/org/cacert/gigi/pages/admin/support/SupportRevokeCertificatesForm.templ
@@ -22,7 +22,7 @@
             <? } ?>
         <tr>
             <th colspan="6">
             <? } ?>
         <tr>
             <th colspan="6">

-                    <input name="revokeall" value="<?=_revoke certificates?>" type="submit">
+                    <input class="btn btn-danger" name="revokeall" value="<?=_revoke certificates?>" type="submit">

             </th>
         </tr>
     </tbody></table>
\ No newline at end of file
             </th>
         </tr>
     </tbody></table>
\ No newline at end of file

diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.templ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.templ
index 7a2ac5c4cd72d36e72c953bf26f0b67448030d35..e259cd26404698d0144275b79282942555bec0c7 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.templ
+++ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.templ
@@ -44,12 +44,12 @@
         <tr>
             <td><?=_Groups?>:</td>
             <td><p><? foreach($groups) { ?><?=$group_name?>, <? } ?></p>
         <tr>
             <td><?=_Groups?>:</td>
             <td><p><? foreach($groups) { ?><?=$group_name?>, <? } ?></p>

-            <p><?=$groupSelector?><input type='submit' value='<?=_Grant Group?>' name='grant'><input type='submit' value='<?=_Deny Group?>' name='deny'></p>
+            <p><?=$groupSelector?><input class="btn btn-info" type='submit' value='<?=_Grant Group?>' name='grant'> <input class="btn btn-info" type='submit' value='<?=_Deny Group?>' name='deny'></p>

             </td>
         </tr>
         <tr>
             <td><?=_Reset Password?>:</td>
             </td>
         </tr>
         <tr>
             <td><?=_Reset Password?>:</td>

-            <td><input type="text" name="aword"> <input type="submit" value="<?=_Reset Password?>" name="resetPass"></td>
+            <td><input type="text" name="aword"> <input class="btn btn-primary" type="submit" value="<?=_Reset Password?>" name="resetPass"></td>

         </tr>
         <tr>
             <td><?=_Delete Account?>:</td>
         </tr>
         <tr>
             <td><?=_Delete Account?>:</td>


@@ -58,7 +58,7 @@
         <tr>
             <td colspan="2"><a href="history"><?=_Show account history?></a></td>
         </tr>
         <tr>
             <td colspan="2"><a href="history"><?=_Show account history?></a></td>
         </tr>

-        <tr><td colspan="2"><input name="detailupdate" type="submit" value="<?=_Update?>"/></td></tr>
+        <tr><td colspan="2"><input class="btn btn-warning" name="detailupdate" type="submit" value="<?=_Update?>"/></td></tr>

     </tbody>
 </table>
 <br/>
     </tbody>
 </table>
 <br/>

diff --git a/src/org/cacert/gigi/pages/main/Signup.templ b/src/org/cacert/gigi/pages/main/Signup.templ
index f590e45800c668c312b2aa8163edc07f50e4c59b..f997cc5ccb48211e3f444a47fee5c922ac696b7d 100644 (file)
--- a/src/org/cacert/gigi/pages/main/Signup.templ
+++ b/src/org/cacert/gigi/pages/main/Signup.templ
@@ -67,7 +67,7 @@
   </tr>
 
   <tr>
   </tr>
 
   <tr>

-    <td colspan="3"><input type="submit" name="process" value="<?=_Next?>"></td>
+    <td colspan="3"><input class="btn btn-primary" type="submit" name="process" value="<?=_Next?>"></td>

   </tr>
   </tbody>
 </table>
   </tr>
   </tbody>
 </table>

diff --git a/src/org/cacert/gigi/pages/orga/AffiliationForm.templ b/src/org/cacert/gigi/pages/orga/AffiliationForm.templ
index 84be5cc4d6f5f257392583615f4503c10aa08522..b44d0bde669813f2ff980fdd2168371832465ceb 100644 (file)
--- a/src/org/cacert/gigi/pages/orga/AffiliationForm.templ
+++ b/src/org/cacert/gigi/pages/orga/AffiliationForm.templ
@@ -10,13 +10,13 @@
     <td><?=$name?></td>
     <td><?=$e-mail?></td>
     <td><?=$master?></td>
     <td><?=$name?></td>
     <td><?=$e-mail?></td>
     <td><?=$master?></td>

-    <td><button type="submit" name="del" value="<?=$e-mail?>">X</button> </td>
+    <td><button class="btn btn-warning" type="submit" name="del" value="<?=$e-mail?>">X</button> </td>

   </tr>
 <? } ?>
   <tr>
     <td></td>
     <td><input class="form-control" type="text" name="email" required></td>
     <td><input type="checkbox" name="master" value="y"></td>
   </tr>
 <? } ?>
   <tr>
     <td></td>
     <td><input class="form-control" type="text" name="email" required></td>
     <td><input type="checkbox" name="master" value="y"></td>

-    <td><input type="submit" name="do_affiliate" value="<?=_Add?>"></td>
+    <td><input class="btn btn-primary" type="submit" name="do_affiliate" value="<?=_Add?>"></td>

   </tr>
 </table>
   </tr>
 </table>

diff --git a/src/org/cacert/gigi/pages/wot/AssuranceForm.templ b/src/org/cacert/gigi/pages/wot/AssuranceForm.templ
index f846bc9641a69589ef0590df79fff5d6bf8fc680..98479f76a376e5965fe4e1aecc1640f610e08392 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/AssuranceForm.templ
+++ b/src/org/cacert/gigi/pages/wot/AssuranceForm.templ
@@ -63,8 +63,8 @@
        </tr>
        <tr>
                <td colspan="2">
        </tr>
        <tr>
                <td colspan="2">

-                       <input type="submit" name="process" value="<?=_I confirm this verification?>" />
-                       <input type="submit" name="cancel" value="<?=_Cancel?>" />
+                       <input class="btn btn-primary" type="submit" name="process" value="<?=_I confirm this verification?>" />
+                       <input class="btn btn-default" type="submit" name="cancel" value="<?=_Cancel?>" />

                </td>
        </tr>
        </tbody>
                </td>
        </tr>
        </tbody>

diff --git a/src/org/cacert/gigi/pages/wot/AssureeSearch.templ b/src/org/cacert/gigi/pages/wot/AssureeSearch.templ
index 51b3bbe0767ffae6b7f65f6e6182c7e7ecf02bbc..5be32b1d82bdad7467042113a5a68ce98f4a0342 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/AssureeSearch.templ
+++ b/src/org/cacert/gigi/pages/wot/AssureeSearch.templ
@@ -16,7 +16,7 @@
     <td><?=$DoB?></td>
   </tr>
   <tr>
     <td><?=$DoB?></td>
   </tr>
   <tr>

-    <td colspan="2"><input type="submit" name="search" value="<?=_Next?>"></td>
+    <td colspan="2"><input class="btn btn-primary" type="submit" name="search" value="<?=_Next?>"></td>

   </tr>
   </tbody>
 </table>
   </tr>
   </tbody>
 </table>

diff --git a/src/org/cacert/gigi/pages/wot/RequestTTPForm.templ b/src/org/cacert/gigi/pages/wot/RequestTTPForm.templ
index e1e28df82b37988b66d0c9b81c1b943d1e5e532b..85d96f9d7a62d9b8a6bde58bc157658acc7cb144 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/RequestTTPForm.templ
+++ b/src/org/cacert/gigi/pages/wot/RequestTTPForm.templ
@@ -13,7 +13,7 @@
        </tr>-->
        <tr>
                <td colspan="2" >
        </tr>-->
        <tr>
                <td colspan="2" >

-                       <input type="submit" name="ttp" value="<?=_I need a TTP verification?>">
+                       <input class="btn btn-primary" type="submit" name="ttp" value="<?=_I need a TTP verification?>">

                </td>
        </tr>
 </table>
                </td>
        </tr>
 </table>