Adding button properties to default buttons.

This commit is contained in:
Just Thomas Misund committed 2013-09-04 20:11:39 +02:00
1 parent 9f4ed5175e
commit 0d0e5c23d7
4 files changed
+18 -18

No files matched your search

+1 -1
View File
@@ -36,7 +36,7 @@ class Form {
}
$pos = strpos($_SERVER['REQUEST_URI'], "action");
if ($pos === false){?>
<!--<a class="btn" href="index.php?action=switch-formtype&amp;section=customize">bytt skjemastil</a>-->
<!--<a class="btn btn-default" href="index.php?action=switch-formtype&amp;section=customize">bytt skjemastil</a>-->
<?php }
}
+6 -6
View File
@@ -202,15 +202,15 @@ class Order {
<td colspan="2"><?php print formatPrice($this->calculateTotalAmount()); ?></td>
</tr>
</table>
<p>Har du gjort endringer? <span class="btn" onclick="document.getElementById('update-order-<?php print $this->id; ?>').submit();">oppdatér</span></p>
<p>Har du gjort endringer? <span class="btn btn-default" onclick="document.getElementById('update-order-<?php print $this->id; ?>').submit();">oppdatér</span></p>
</form>
<p>Handle mer? <a class="btn" href="index.php?page=display-webshop">tilbake til produkter</a></p>
<p>Handle mer? <a class="btn btn-default" href="index.php?page=display-webshop">tilbake til produkter</a></p>
<form action="index.php?action=cart-checkout" method="post">
<div>
<input type="hidden" name="order_id" value="<?php print $this->id; ?>" />
<input type="hidden" name="transaction_id_string" value="<?php print createTransactionId(); ?>" /></div>
<p>Er du ferdig? <a class="btn" href="index.php?action=cart-checkout&amp;order_id=<?php print $this->id; ?>&amp;transaction_id_string=<?php print createTransactionId(); ?>">gå til betaling</a></p>
<p>Er du ferdig? <a class="btn btn-primary" href="index.php?action=cart-checkout&amp;order_id=<?php print $this->id; ?>&amp;transaction_id_string=<?php print createTransactionId(); ?>">gå til betaling</a></p>
</form>
<?php
}else {
@@ -251,9 +251,9 @@ class Order {
<p>Ordrestatus: <strong><?php print $this->order_status_value; ?></strong>
<?php if ($edit && $this->order_status_id < 3) { ?>
<p>
<a class="btn" href="index.php?page=display-cart&amp;order_id=<?php print $this->id; ?>">rediger ordre</a>
<a class="btn" href="index.php?page=display-carts&amp;action=delete-order&amp;order_id=<?php print $this->id; ?>">slett ordre</a>
<a class="btn" href="index.php?action=cart-checkout&amp;order_id=<?php print $this->id; ?>&amp;transaction_id_string=<?php print createTransactionId(); ?>">gå til betaling</a>
<a class="btn btn-default" href="index.php?page=display-cart&amp;order_id=<?php print $this->id; ?>">rediger ordre</a>
<a class="btn btn-default" href="index.php?page=display-carts&amp;action=delete-order&amp;order_id=<?php print $this->id; ?>">slett ordre</a>
<a class="btn btn-default" href="index.php?action=cart-checkout&amp;order_id=<?php print $this->id; ?>&amp;transaction_id_string=<?php print createTransactionId(); ?>">gå til betaling</a>
</p>
<?php }
}else {
+10 -10
View File
@@ -610,14 +610,14 @@ class Page {
<?php
}
?>
<a class="btn" href="index.php?page=display-current-user">Oppdatér brukerinfo</a>
<a class="btn" href="index.php?page=display-webshop">Bestill nytt medlemskort</a>
<a class="btn btn-default" href="index.php?page=display-current-user">Oppdatér brukerinfo</a>
<a class="btn btn-default" href="index.php?page=display-webshop">Bestill nytt medlemskort</a>
<div class="bliaktiv">
<h3>Engasjer deg!</h3>
<p>Visste du at Studentersamfundet drives av frivillige studenter? Å være aktiv i en studentforening er en sosial affære. Det skaffer deg fort både venner og erfaring.</p>
<p>La det neste året være året du husker. Finn en ny interesse i dag!</p>
<a class="btn" href="http://studentersamfundet.no/bli-aktiv/">Engasjer deg</a>
<a class="btn btn-default" href="http://studentersamfundet.no/bli-aktiv/">Engasjer deg</a>
</div>
<?php
} else {
@@ -2542,7 +2542,7 @@ Om dere lager en facebook side til arrangementet, ikke glem &aring; putte inn le
$form->display();
?>
<span class="btn" onclick="toggleDisplay('user-groups'); toggleText(this, 'vis grupper', 'skjul grupper');">vis grupper</span>
<span class="btn btn-default" onclick="toggleDisplay('user-groups'); toggleText(this, 'vis grupper', 'skjul grupper');">vis grupper</span>
<div id="user-groups" style="display: none;">
<?php
$user->displayGroups();
@@ -2571,7 +2571,7 @@ Om dere lager en facebook side til arrangementet, ikke glem &aring; putte inn le
<?php
if(checkAuth("view-user-updates")){
?>
<span class="btn" onclick="toggleDisplay('user-updates'); toggleText(this, 'vis endringer', 'skjul endringer');">vis endringer</span>
<span class="btn btn-default" onclick="toggleDisplay('user-updates'); toggleText(this, 'vis endringer', 'skjul endringer');">vis endringer</span>
<div id="user-updates" style="display: none">
<?php
$user->displayUpdates();
@@ -2579,7 +2579,7 @@ Om dere lager en facebook side til arrangementet, ikke glem &aring; putte inn le
}
if(checkAuth("view-delete-user")){
?>
<!--a class="btn" href="javascript: if(confirm('Slett bruker?\n\nDette kan ikke angres!')) {
<!--a class="btn btn-default" href="javascript: if(confirm('Slett bruker?\n\nDette kan ikke angres!')) {
location='index.php?action=delete-user&amp;userid=<?php print $user->id;?>'};">slett bruker</a-->
<?php
}
@@ -2736,7 +2736,7 @@ Om dere lager en facebook side til arrangementet, ikke glem &aring; putte inn le
private function _displayProduct() {
?>
<p><a class="btn" href="index.php?page=display-webshop">tilbake til produkter</a></p>
<p><a class="btn btn-default" href="index.php?page=display-webshop">tilbake til produkter</a></p>
<?php
$product = new Product(scriptParam('productid'));
$product->display();
@@ -3010,9 +3010,9 @@ Om dere lager en facebook side til arrangementet, ikke glem &aring; putte inn le
function _displayBugReports(){
?>
<p>
<a class="btn" href="index.php?page=display-bugreports&amp;selection=all">vis alle</a>
<a class="btn" href="index.php?page=display-bugreports&amp;selection=old">vis behandlede</a>
<a class="btn" href="index.php?page=display-bugreports&amp;selection=new">vis ikke behandlede</a>
<a class="btn btn-default" href="index.php?page=display-bugreports&amp;selection=all">vis alle</a>
<a class="btn btn-default" href="index.php?page=display-bugreports&amp;selection=old">vis behandlede</a>
<a class="btn btn-default" href="index.php?page=display-bugreports&amp;selection=new">vis ikke behandlede</a>
</p>
<?php
$selection = scriptParam("selection");
+1 -1
View File
@@ -1204,7 +1204,7 @@ function reportBug($type) {
function displayBugReportForm($type) {
?>
<span class="btn" onclick="toggleDisplay('bug-report-form'); toggleText(this, 'rapportér problem', 'skjul skjema');">rapportér problem</span>
<span class="btn btn-default" onclick="toggleDisplay('bug-report-form'); toggleText(this, 'rapportér problem', 'skjul skjema');">rapportér problem</span>
<div id="bug-report-form" style="display: none;">
<?php