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-09-04 18:18:53 +02:00
2 parents 9c05424110 9f4ed5175e
commit a1a2559210
3 files changed
+20 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

css/style.css
+5 -5
View File
@@ -9,8 +9,8 @@
/* Layout */
/*#wrapper */
#header .site-title,
#header #menu ul ul,
#branding .site-title,
#branding #menu ul ul,
#main {
width:1000px;
margin:auto;
@@ -79,10 +79,10 @@ body.dns {
background:#efefef;
}
/*body.dns */
#header {
#branding {
background:#191919 url('../graphics/header-210x.png') repeat-x bottom;
}
#header {
#branding {
height:110px;
margin-bottom:10px;
overflow:hidden;
@@ -195,7 +195,7 @@ body.dns {
background: #444444;
}
#header .aapningstider {
#branding .aapningstider {
font-size:12px;
left:50%;
margin-left:366px;
inside/Navigation.php
+8 -8
View File
@@ -36,7 +36,7 @@ class Navigation {
if(checkAuth("view-menu-divisions")) {
?>
<li class="menulist dropdown">
<a href="#" id="divisionsSwitch" class="switch dropdown-toggle">Foreninger <b class="caret"></a>
<a href="#" id="divisionsSwitch" class="switch dropdown-toggle">Foreninger <b class="caret"></b></a>
<ul id="divisionsMenu" class="menu dropdown-menu">
<li><a href="index.php?page=display-divisions">Vis foreninger</a></li>
<?php if(checkAuth("view-register-division")){
@@ -53,7 +53,7 @@ class Navigation {
if(checkAuth("view-menu-documents")){
?>
<li class="menulist dropdown">
<a href="#" id="documentsSwitch" class="switch dropdown-toggle">Dokumenter <b class="caret"></a>
<a href="#" id="documentsSwitch" class="switch dropdown-toggle">Dokumenter <b class="caret"></b></a>
<ul id="documentsMenu" class="menu dropdown-menu">
<li><a href="index.php?page=display-documents">Vis dokumenter</a></li>
<?php if(checkAuth("view-upload-document")){
@@ -65,7 +65,7 @@ class Navigation {
if(checkAuth("view-menu-users")){
?>
<li class="menulist dropdown">
<a href="#" id="usersSwitch" class="switch dropdown-toggle">Medlemmer <b class="caret"></a>
<a href="#" id="usersSwitch" class="switch dropdown-toggle">Medlemmer <b class="caret"></b></a>
<ul id="usersMenu" class="menu dropdown-menu">
<li><a href="index.php?page=display-users">Vis medlemmer</a></li>
<?php if(checkAuth("view-register-user")){
@@ -102,7 +102,7 @@ class Navigation {
if(checkAuth("view-membership-sale")){
?>
<li class="menulist dropdown">
<a href="#" id="billettbodSwitch" class="switch dropdown-toggle">Billettbod <b class="caret"></a>
<a href="#" id="billettbodSwitch" class="switch dropdown-toggle">Billettbod <b class="caret"></b></a>
<ul id="billettbodMenu" class="menu dropdown-menu">
<li><a href="index.php?page=membership-sale">Salg av medlemskap</a></li>
<?php if(checkAuth("view-membercard-production")){
@@ -115,7 +115,7 @@ class Navigation {
if(checkAuth("view-menu-access")){
?>
<li class="menulist dropdown">
<a href="#" id="accessSwitch" class="switch dropdown-toggle">Tilgang <b class="caret"></a>
<a href="#" id="accessSwitch" class="switch dropdown-toggle">Tilgang <b class="caret"></b></a>
<ul id="accessMenu" class="menu dropdown-menu">
<li><a href="index.php?page=display-groups">Vis grupper</a></li>
<li><a href="index.php?page=register-group">Registrér gruppe</a></li>
@@ -130,7 +130,7 @@ class Navigation {
if(checkAuth("view-menu-settings")){
?>
<li class="menulist dropdown">
<a href="#" id="settingsSwitch" class="switch dropdown-toggle">Innstillinger <b class="caret"></a>
<a href="#" id="settingsSwitch" class="switch dropdown-toggle">Innstillinger <b class="caret"></b></a>
<ul id="settingsMenu" class="menu dropdown-menu">
<!--<li><a href="index.php?action=switch-formtype&amp;section=settings">Bytt skjemastil</a></li>
<li><a href="index.php?action=switch-tinymce-theme&amp;section=settings">Bytt RT-editor</a></li>-->
@@ -145,7 +145,7 @@ class Navigation {
if (isAdmin()) {
?>
<li class="menulist dropdown">
<a href="#" id="smsSwitch" class="switch dropdown-toggle">SMS <b class="caret"></a>
<a href="#" id="smsSwitch" class="switch dropdown-toggle">SMS <b class="caret"></b></a>
<ul id="smsMenu" class="menu dropdown-menu">
<li><a href="?page=display-sms-log">Vis logg for SMS-tjeneste</a></li>
</ul>
@@ -156,7 +156,7 @@ class Navigation {
if(checkAuth("view-menu-webshop")){
?>
<li class="menulist dropdown">
<a href="#" id="webshopSwitch" class="switch dropdown-toggle">Nettbutikk <b class="caret"></a>
<a href="#" id="webshopSwitch" class="switch dropdown-toggle">Nettbutikk <b class="caret"></b></a>
<ul id="webshopMenu" class="menu dropdown-menu">
<li><a href="index.php?page=display-webshop">Vis produkter</a></li>
<li><a href="index.php?page=display-carts">Vis handlekurver</a></li>
inside/Page.php
+7 -3
View File
@@ -29,9 +29,13 @@ class Page {
?>
<body class="dns section-inside">
<div id="container">
<div id="header">
<span class="site-title"><a href="http://studentersamfundet.no/"><?php print $this->page_title; ?></a></span>
</div> <!-- #header -->
<header id="branding">
<div class="logo">
<div class="site-title">
<a href="http://studentersamfundet.no/"><?php print $this->page_title; ?></a>
</div>
</div>
</header>
<div id="content-wrap">
<div id="content" class="clearfix">