diff --git a/inside/Divisions.php b/inside/Divisions.php index 9545d4a..8aa56d6 100644 --- a/inside/Divisions.php +++ b/inside/Divisions.php @@ -110,4 +110,4 @@ class Divisions { } } } -?> \ No newline at end of file +?> diff --git a/inside/Page.php b/inside/Page.php index 43ddda1..d9b4dfc 100644 --- a/inside/Page.php +++ b/inside/Page.php @@ -98,7 +98,7 @@ possibly include it instead? --Thomas Misund, 26. Oct 2009 @@ -114,10 +114,11 @@ possibly include it instead? --Thomas Misund, 26. Oct 2009
+
_displayNavigation(); ?> -
+
0){ @@ -457,11 +458,11 @@ possibly include it instead? --Thomas Misund, 26. Oct 2009 $this->_editJobCategory(); break; - case "display-product": - $this->_displayProduct(); - break; + case "display-product": + $this->_displayProduct(); + break; - case "display-products": + case "display-products": case "register-product": $this->_registerProduct(); break; @@ -478,51 +479,51 @@ possibly include it instead? --Thomas Misund, 26. Oct 2009 $this->_displayBugReports(); break; - case "display-webshop": - $this->_displayWebshop(); - break; + case "display-webshop": + $this->_displayWebshop(); + break; - case "display-sales": - $this->_displaySales(); - break; + case "display-sales": + $this->_displaySales(); + break; - case "display-sales-item": - $this->_displaySalesItem(); - break; + case "display-sales-item": + $this->_displaySalesItem(); + break; - case "display-cart": - $this->_displayCart(); - break; + case "display-cart": + $this->_displayCart(); + break; - case "display-carts": - $this->_displayCarts(); - break; + case "display-carts": + $this->_displayCarts(); + break; - case "cart-checkout": - $this->_cartCheckout(); - break; + case "cart-checkout": + $this->_cartCheckout(); + break; - case "transaction-confirmation": - $this->_transactionConfirmation(); - break; + case "transaction-confirmation": + $this->_transactionConfirmation(); + break; - case "display-sms-log": - $this->_displaySmsLog(); - break; + case "display-sms-log": + $this->_displaySmsLog(); + break; - case 'membership-sale': - $this->_membershipSale(); - break; + case 'membership-sale': + $this->_membershipSale(); + break; - case 'membercard-production': - $this->_membercardProduction(); - break; + case 'membercard-production': + $this->_membercardProduction(); + break; default: $this->_displayHome(); } - }else { + } else { $this->_displayAccessDenied(); } } @@ -532,12 +533,7 @@ possibly include it instead? --Thomas Misund, 26. Oct 2009
Script execution: $time seconds || support
\n"); - + $this->_displayFooter(); ?>
@@ -545,6 +541,17 @@ print("
Script execution: $time seconds || + +
+Script execution: $time seconds || support
\n"); + + } + public function _displayHeader(){?> @@ -554,12 +561,13 @@ print("
Script execution: $time seconds || + - + @@ -630,7 +638,7 @@ print("
Script execution: $time seconds || Velkommen til Studentersamfundets Intranett.

\n"; + print "

Velkommen til Studentersamfundets intranett.

\n"; } public @@ -3310,4 +3318,4 @@ Teksten under er hentet fra kunnskapsdatabasen. Du st } -?> \ No newline at end of file +?> diff --git a/inside/functions.php b/inside/functions.php index 930c515..2f9919c 100644 --- a/inside/functions.php +++ b/inside/functions.php @@ -879,10 +879,10 @@ function displayOptionsMenu($id, $name, $type, $actionName = NULL, $editable = t function displayOptionsMenuTable($id, $name, $type, $actionName = NULL, $editable = true, $next_page = NULL) { if (checkAuth($actionName)) { if ($editable == true) { - print ("\"edit\""); + print ("\"edit\""); } if ($type == "documentcategory" || $type == "eventcategory" || $type == "jobcategory") { - print ("\"""); @@ -905,7 +905,7 @@ function displayOptionsMenuTable($id, $name, $type, $actionName = NULL, $editabl else { $page = $next_page; } - print ("\"""); } diff --git a/inside/screen.css b/inside/screen.css index ad25c82..f6a6b7f 100644 --- a/inside/screen.css +++ b/inside/screen.css @@ -220,7 +220,9 @@ div.horizontal-form { *********************************************************************/ table { - margin: 5px 0; + display: block; + float:left; + margin: 0; padding: 0; border: 1px solid #CCC; } @@ -265,14 +267,21 @@ td.is_member{ text-align: center; } +td.edit, +td.delete { + min-width:16px; +} + tr.table-footer td { font-weight: bold; text-align: center; } table.calendar { - width: 98%; - margin: 0 auto; + display:block; + float:left; + width:630px; + /*margin: 0 50px 0 0;*/ font-size: .85em; } @@ -551,7 +560,7 @@ h4 { -moz-border-radius: 8px; color: #000; width: 170px; - margin: 5px 0 15px 0; + margin: 50px 25px; padding: 15px; } @@ -630,7 +639,7 @@ span.key { #calHeader { width: 400px; - margin: 0 auto; + margin: auto; } #previous { @@ -660,12 +669,24 @@ span.key { margin: 5px 0 15px 207px; } +#content #inside-content-column { + width:648px; + margin:50px 25px; + float:left; +} + +#content .contentElem { + margin:auto; +} + div.text-column { - max-width: 600px; + margin:auto; + float:left; } * html div.text-column { - width: 600px; + margin:auto; + float:left; } div.article_images { @@ -872,3 +893,11 @@ div.comment-main { .domenabled div.disabled { display: none; } + +/* =icons + *********************************************************************/ +.icon-16x16 { + width:16px !important; + height:16px; + border:none; +}