From 5be029ac0824963d77b41b5a4218e6d2122cf2e7 Mon Sep 17 00:00:00 2001
From: Alex <ddrmoscow@gmail.com>
Date: Mon, 10 Aug 2015 01:37:07 +0300
Subject: [PATCH] removed admin.css and display.css as not required anymore
 Temporary switch dashpoard to display/index.php

---
 admin/index.php   |  2 +-
 css/admin.css     | 42 ------------------------------------------
 css/display.css   |  4 ----
 display/index.php |  2 +-
 4 files changed, 2 insertions(+), 48 deletions(-)
 delete mode 100644 css/admin.css
 delete mode 100644 css/display.css

diff --git a/admin/index.php b/admin/index.php
index 6be6b8f4..29b92050 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -92,7 +92,7 @@ include ("../lang.inc.php");
 	<!-- Sidebar menu -->
 	<div class="sidebar" >
 	    <ul class="panel-group nav"    id="nav">
-		  <li><a class="" href="?"><i class="fa fa-tachometer fa-lg"></i><span><?php print T_("Dashboard") ;?></span></a></li>
+		  <li><a class="" href="?page=../display/index.php"><i class="fa fa-tachometer fa-lg"></i><span><?php print T_("Dashboard") ;?></span></a></li>
           <li class="has_sub"><a href="" class=""><i class="fa fa-list-alt fa-lg"></i><span class="arrow"><?php print T_("Questionnairies") ;?></span></a>
           <ul style="<?php if ($g == 1) echo "display:block";?>">
 				<li><a href="?g=1&amp;page=<?php echo LIME_URL ;?>admin/admin.php?action=newsurvey"><i class="fa fa-file-text-o lime fa-fw"></i><?php print T_("Create an instrument in Limesurvey") ;?></a></li>
diff --git a/css/admin.css b/css/admin.css
deleted file mode 100644
index d8be7d7a..00000000
--- a/css/admin.css
+++ /dev/null
@@ -1,42 +0,0 @@
-#menu ul{
-  list-style: none;
-  margin: 0;
-  padding: 0;
-}
-#menu ul ul{
-  list-style: square inside;
-  margin: 5px;
-  marker-offset: auto;
-}
-#menu h3 {
-  font-size: 100%;
-  margin-top: 10px;
-  margin-bottom: 0;
-}
-
-#menu {
-  position : absolute;
-  width : 20%;
-  height : 100%;
-  top : 0;
-  right : 0;
-  bottom : auto;
-  left : 0;
-  overflow: auto;  
-  font-size: 0.8em;
-/*border-bottom: 1px solid #aaa;*/
-}
-#main {
-  position : absolute;
-  top : 0;
-  left : 20%;
-  bottom : auto;
-  width : 80%;
-  height : 100%;
-}
-.embeddedobject {
-  width:100%;
-  height:100%;
-  position:absolute;
-}
-
diff --git a/css/display.css b/css/display.css
deleted file mode 100644
index cb2841c0..00000000
--- a/css/display.css
+++ /dev/null
@@ -1,4 +0,0 @@
-h1 {font-family: Arial, sans-serif; font-size: 400%; text-align: center;}
-h2 {font-family: Arial, sans-serif; font-size: 1100%; text-align: center;}
-h3 {font-family: Arial, sans-serif; font-size: 150%; text-align: center;}
-p {font-family: Arial, sans-serif; font-size: 100%;}
diff --git a/display/index.php b/display/index.php
index e503bc27..8c9c4da0 100644
--- a/display/index.php
+++ b/display/index.php
@@ -108,7 +108,7 @@ if ($shift_id == 0)
 }
 
 $dt1 = $display_type + 1;
-xhtml_head(T_("Display"),true,array("../css/display.css"),false,false,"6;url=?shift_id=$shift_id&amp;questionnaire_id=$questionnaire_id&amp;display_type=$dt1");
+xhtml_head(T_("Display"),true,array("../include/bootstrap/css/bootstrap.min.css","../include/bootstrap/css/bootstrap-theme.min.css","../css/custom.css"),false,false,"6;url=?shift_id=$shift_id&amp;questionnaire_id=$questionnaire_id&amp;display_type=$dt1");
 
 if ($shift_id == 0 || $questionnaire_id == 0)
 	display_none();