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 17:59:05 +02:00
2 parents 8a294ae7e9 9223891c7b
commit 9c05424110
6 files changed
+20 -25
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

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</a>
<a href="#" id="divisionsSwitch" class="switch dropdown-toggle">Foreninger <b class="caret"></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</a>
<a href="#" id="documentsSwitch" class="switch dropdown-toggle">Dokumenter <b class="caret"></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</a>
<a href="#" id="usersSwitch" class="switch dropdown-toggle">Medlemmer <b class="caret"></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</a>
<a href="#" id="billettbodSwitch" class="switch dropdown-toggle">Billettbod <b class="caret"></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</a>
<a href="#" id="accessSwitch" class="switch dropdown-toggle">Tilgang <b class="caret"></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</a>
<a href="#" id="settingsSwitch" class="switch dropdown-toggle">Innstillinger <b class="caret"></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</a>
<a href="#" id="smsSwitch" class="switch dropdown-toggle">SMS <b class="caret"></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</a>
<a href="#" id="webshopSwitch" class="switch dropdown-toggle">Nettbutikk <b class="caret"></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
+2 -3
View File
@@ -485,9 +485,8 @@ class Page {
}
public function _displayHeader(){?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="no" lang="no">
<!DOCTYPE html>
<html lang="no">
<head>
<meta http-equiv="content-type" content="text/html;charset=iso-8859-1" />
inside/programutvalg.php
+2 -3
View File
@@ -6,9 +6,8 @@ require_once "includes.php";
$id = scriptParam("id");
$prog = new ProgramSelection($id);
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="no" lang="no">
<!DOCTYPE html>
<html lang="no">
<head>
<title>Programutvalg for Det Norske Studentersamfund</title>
inside/ukesprogram.php
+2 -3
View File
@@ -25,9 +25,8 @@
$mode = "view";
}
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="no" lang="no">
<!DOCTYPE html>
<html lang="no">
<head>
<title>Ukesprogram for Det Norske Studentersamfund</title>
inside/ukesprogramprint.php
+3 -4
View File
@@ -9,9 +9,8 @@ $id = scriptParam("id");
$prog = new WeekProgram($id);
$mode = scriptParam("mode");
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="no" lang="no">
<!DOCTYPE html>
<html lang="no">
<head>
<title>Ukesprogram for Det Norske Studentersamfund</title>
@@ -58,4 +57,4 @@ while ($current = $week_list->fetchRow(DB_FETCHMODE_OBJECT)) {
</div>
</body>
</html>
</html>
inside/ukesprogramuniversitas.php
+3 -4
View File
@@ -52,9 +52,8 @@ $week_list = $gigs->getListWeek($start, $end);
$mode = scriptParam("mode");
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="no" lang="no">
<!DOCTYPE html>
<html lang="no">
<head>
<title>Ukesprogram for Det Norske Studentersamfund</title>
@@ -194,4 +193,4 @@ while ($current = $week_list->fetchRow(DB_FETCHMODE_OBJECT)) {
</div>
</div>
</body>
</html>
</html>