edb/inside
Archived
9
0 Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.neuf.no/inside

Browse Source
This commit is contained in:
root@amen committed 2013-08-29 05:10:02 +02:00
2 parents e294ee1ee8 f5ee7d8a99
commit 2bd6620744
6 files changed
+19 -19
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

inside/Calendar.php
+3 -3
View File
@@ -176,11 +176,11 @@ Class Calendar {
case 'all':
?>
<div>
<label class="calendar-event button" ><input type="checkbox" id="calendar-toggle-events"
<label class="calendar-event btn" ><input type="checkbox" id="calendar-toggle-events"
onclick="toggleElements('div', 'calendar-event', this);"
checked="checked" />
Interne arrangementer</label><br />
<label class="calendar-concert button"><input type="checkbox" id="calendar-toggle-concerts"
<label class="calendar-concert btn"><input type="checkbox" id="calendar-toggle-concerts"
onclick="toggleElements('div', 'calendar-concert', this);"
checked="checked" />
Åpne arrangementer</label>
@@ -191,7 +191,7 @@ Class Calendar {
case 'barshifts':
?>
<div>
<label class="calendar-barshifworker button" ><input type="checkbox" id="calendar-toggle-barshiftworkers"
<label class="calendar-barshifworker btn" ><input type="checkbox" id="calendar-toggle-barshiftworkers"
onchange="toggleElements('ul', 'barshift-workers', this);"
checked="checked" />
Vis personell</label><br />
inside/Concert.php
+1 -1
View File
@@ -553,7 +553,7 @@ class Concert {
public
function _displayReport() {
?>
<span class="button" onclick="toggleDisplay('report-form-<?php print $this->id; ?>'); toggleText(this, 'vis arrangementsrapport', 'skjul arrangementsrapport');">vis arrangementsrapport</span>
<span class="btn" onclick="toggleDisplay('report-form-<?php print $this->id; ?>'); toggleText(this, 'vis arrangementsrapport', 'skjul arrangementsrapport');">vis arrangementsrapport</span>
<div id="report-form-<?php print $this->id; ?>" style="display: none;">
<?php
$sql = "SELECT id FROM din_concert_report WHERE concert_id = $this->id";
inside/Form.php
+1 -1
View File
@@ -36,7 +36,7 @@ class Form {
}
$pos = strpos($_SERVER['REQUEST_URI'], "action");
if ($pos === false){?>
<!--<a class="button" href="index.php?action=switch-formtype&amp;section=customize">bytt skjemastil</a>-->
<!--<a class="btn" href="index.php?action=switch-formtype&amp;section=customize">bytt skjemastil</a>-->
<?php }
}
inside/Order.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="button" onclick="document.getElementById('update-order-<?php print $this->id; ?>').submit();">oppdatér</span></p>
<p>Har du gjort endringer? <span class="btn" onclick="document.getElementById('update-order-<?php print $this->id; ?>').submit();">oppdatér</span></p>
</form>
<p>Handle mer? <a class="button" href="index.php?page=display-webshop">tilbake til produkter</a></p>
<p>Handle mer? <a class="btn" 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="button" 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" 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="button" href="index.php?page=display-cart&amp;order_id=<?php print $this->id; ?>">rediger ordre</a>
<a class="button" href="index.php?page=display-carts&amp;action=delete-order&amp;order_id=<?php print $this->id; ?>">slett ordre</a>
<a class="button" 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" 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>
</p>
<?php }
}else {
inside/Page.php
+7 -7
View File
@@ -2543,7 +2543,7 @@ Om dere lager en facebook side til arrangementet, ikke glem &aring; putte inn le
$form->display();
?>
<span class="button" onclick="toggleDisplay('user-groups'); toggleText(this, 'vis grupper', 'skjul grupper');">vis grupper</span>
<span class="btn" onclick="toggleDisplay('user-groups'); toggleText(this, 'vis grupper', 'skjul grupper');">vis grupper</span>
<div id="user-groups" style="display: none;">
<?php
$user->displayGroups();
@@ -2572,7 +2572,7 @@ Om dere lager en facebook side til arrangementet, ikke glem &aring; putte inn le
<?php
if(checkAuth("view-user-updates")){
?>
<span class="button" onclick="toggleDisplay('user-updates'); toggleText(this, 'vis endringer', 'skjul endringer');">vis endringer</span>
<span class="btn" onclick="toggleDisplay('user-updates'); toggleText(this, 'vis endringer', 'skjul endringer');">vis endringer</span>
<div id="user-updates" style="display: none">
<?php
$user->displayUpdates();
@@ -2580,7 +2580,7 @@ Om dere lager en facebook side til arrangementet, ikke glem &aring; putte inn le
}
if(checkAuth("view-delete-user")){
?>
<!--a class="button" href="javascript: if(confirm('Slett bruker?\n\nDette kan ikke angres!')) {
<!--a class="btn" 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
}
@@ -2737,7 +2737,7 @@ Om dere lager en facebook side til arrangementet, ikke glem &aring; putte inn le
private function _displayProduct() {
?>
<p><a class="button" href="index.php?page=display-webshop">tilbake til produkter</a></p>
<p><a class="btn" href="index.php?page=display-webshop">tilbake til produkter</a></p>
<?php
$product = new Product(scriptParam('productid'));
$product->display();
@@ -3011,9 +3011,9 @@ Om dere lager en facebook side til arrangementet, ikke glem &aring; putte inn le
function _displayBugReports(){
?>
<p>
<a class="button" href="index.php?page=display-bugreports&amp;selection=all">vis alle</a>
<a class="button" href="index.php?page=display-bugreports&amp;selection=old">vis behandlede</a>
<a class="button" href="index.php?page=display-bugreports&amp;selection=new">vis ikke behandlede</a>
<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>
</p>
<?php
$selection = scriptParam("selection");
inside/functions.php
+1 -1
View File
@@ -1204,7 +1204,7 @@ function reportBug($type) {
function displayBugReportForm($type) {
?>
<span class="button" onclick="toggleDisplay('bug-report-form'); toggleText(this, 'rapportér problem', 'skjul skjema');">rapportér problem</span>
<span class="btn" 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