Starting design conversion
This commit is contained in:
thomas committed
1 parent
b12c006558
commit
43adb20579
4 files changed
+94
-57
No files matched your search
@@ -110,4 +110,4 @@ class Divisions {
|
||||
}
|
||||
}
|
||||
}
|
||||
?>
|
||||
?>
|
||||
+54
-46
@@ -98,7 +98,7 @@ possibly include it instead? --Thomas Misund, 26. Oct 2009
|
||||
<ul>
|
||||
<li><a href="https://www.studentersamfundet.no/inside/">Inside</a></li>
|
||||
<li><a href="http://studentersamfundet.no/viteboka/?page_id=3">Viteboka</a></li>
|
||||
<li><a href="https://www.studentersamfundet.no/inside/index.php?page=display-barshifts-calendar">Tappetårnets vaktliste</a>
|
||||
<li><a href="https://www.studentersamfundet.no/inside/index.php?page=display-barshifts-calendar">Tappetårnets vaktliste</a></li>
|
||||
<li><a href="http://studentersamfundet.no/aktive.php">Andre ressurser</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
@@ -114,10 +114,11 @@ possibly include it instead? --Thomas Misund, 26. Oct 2009
|
||||
</div> <!-- #header -->
|
||||
|
||||
<div id="content-wrap">
|
||||
<div id="content" class="clearfix">
|
||||
<?php
|
||||
$this->_displayNavigation();
|
||||
?>
|
||||
<div id="content" class="clearfix">
|
||||
<div id="inside-content-column">
|
||||
<?php
|
||||
|
||||
if ($GLOBALS['err_counter'] > 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
|
||||
</div> <!-- #content-wrap -->
|
||||
|
||||
<?php
|
||||
|
||||
$time_end = microtime(true);
|
||||
$time = round(($time_end - $GLOBALS['time_start']), 4);
|
||||
|
||||
print(" <div id=\"footer\">Script execution: $time seconds || <a href=\"mailto:support@studentersamfundet.no\">support</a></div>\n");
|
||||
|
||||
$this->_displayFooter();
|
||||
?>
|
||||
</div>
|
||||
</body>
|
||||
@@ -545,6 +541,17 @@ print(" <div id=\"footer\">Script execution: $time seconds || <a href=\"mai
|
||||
<?php
|
||||
}
|
||||
|
||||
public function _displayFooter() { ?>
|
||||
|
||||
</div> <!-- #inside-content-column -->
|
||||
<?php
|
||||
$time_end = microtime(true);
|
||||
$time = round(($time_end - $GLOBALS['time_start']), 4);
|
||||
|
||||
print(" <div id=\"footer\">Script execution: $time seconds || <a href=\"mailto:support@studentersamfundet.no\">support</a></div>\n");
|
||||
|
||||
}
|
||||
|
||||
public function _displayHeader(){?>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||
@@ -554,12 +561,13 @@ print(" <div id=\"footer\">Script execution: $time seconds || <a href=\"mai
|
||||
<meta http-equiv="content-type" content="text/html;charset=iso-8859-1" />
|
||||
<link rel="stylesheet" title="default" type="text/css"
|
||||
href="<?php print $this->theme; ?>" media="screen, projection" />
|
||||
<link rel="stylesheet" type="text/css" href="http://studentersamfundet.no/style.css" media="screen" />
|
||||
<link rel="stylesheet" type="text/css" href="handheld.css" media="handheld" />
|
||||
<link rel="stylesheet" type="text/css" href="print.css" media="print" />
|
||||
<link rel="shortcut icon" href="favicon.ico" />
|
||||
<script type="text/javascript" src="functions.js"></script>
|
||||
<script type="text/javascript" src="ajax.js"></script>
|
||||
<script type="text/javascript" src="../includes/zXml/zxml.js"></script>
|
||||
<script type="text/javascript" src="../includes/zXml/zxml.js"></script>
|
||||
<script type="text/javascript" src="finder.js"></script>
|
||||
<script type="text/javascript" src="sorttable.js"></script>
|
||||
<script type="text/javascript" src="menuExpandable3.js"></script>
|
||||
@@ -630,7 +638,7 @@ print(" <div id=\"footer\">Script execution: $time seconds || <a href=\"mai
|
||||
|
||||
public
|
||||
function _displayWelcome(){
|
||||
print "<p>Velkommen til Studentersamfundets Intranett.</p>\n";
|
||||
print "<p>Velkommen til Studentersamfundets intranett.</p>\n";
|
||||
}
|
||||
|
||||
public
|
||||
@@ -3310,4 +3318,4 @@ Teksten under er hentet fra kunnskapsdatabasen. Du st
|
||||
|
||||
}
|
||||
|
||||
?>
|
||||
?>
|
||||
@@ -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 ("<td><a title=\"edit\" href=\"index.php?page=edit-$type&" . $type . "id=$id\"><img src=\"graphics/edit.png\" alt=\"edit\" $name\" /></a></td>");
|
||||
print ("<td class=\"edit\"><a title=\"edit\" class=\"icon-16x16\" href=\"index.php?page=edit-$type&" . $type . "id=$id\"><img src=\"graphics/edit.png\" alt=\"edit\" $name\" /></a></td>");
|
||||
}
|
||||
if ($type == "documentcategory" || $type == "eventcategory" || $type == "jobcategory") {
|
||||
print ("<td><a title=\"delete\" href=\"javascript:
|
||||
print ("<td class=\"delete\"><a title=\"delete\" href=\"javascript:
|
||||
if(confirm('" . getConfirmDeleteText($name) . "')){
|
||||
deleteObject('$type', $id);}\"><img src=\"graphics/delete.png\" alt=\"" . DELETE . " $name\" /></a></td>");
|
||||
|
||||
@@ -905,7 +905,7 @@ function displayOptionsMenuTable($id, $name, $type, $actionName = NULL, $editabl
|
||||
else {
|
||||
$page = $next_page;
|
||||
}
|
||||
print ("<td><a title=\"delete\" href=\"javascript:
|
||||
print ("<td class=\"delete\"><a title=\"delete\" href=\"javascript:
|
||||
if(confirm('" . getConfirmDeleteText($name) . "')){
|
||||
location='index.php?action=delete-$type" . $id_string . "&page=$page';}\"><img src=\"graphics/delete.png\" alt=\"" . DELETE . " $name\" /></a></td>");
|
||||
}
|
||||
|
||||
+36
-7
@@ -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;
|
||||
}
|
||||
Reference in new issue
Block a user