Merge branch 'master' of ssh://gitolite@asdynamics.com:50005/projects/fdn2.git

private/lib/dao/GenericDao.php

@@ -115,9 +115,10 @@ class GenericDao{
 		
 		$saveObj = $model->getSaveableObj();
 		
-		if ( !is_null($saveObj->_id) ){
+		if ( array_key_exists("_id", $saveObj) && !is_null($saveObj["_id"]) ){
 			$saveObj["deleted"] = true;
-			$collection->update( array("_id"=>$id), $saveObj );
+			$collection->update( array("_id"=>$saveObj["_id"] ), $saveObj );
+			$model->updateFromSaveableObj($saveObj);
 		}
 	}
 	

private/lib/gui/MenuGenerator.php

@@ -29,6 +29,17 @@ class MenuGenerator {
 		return $rval;
 	}
 	
+	public static function generateMenu(){
+		$voices = self::getVoices();
+		if (sizeof($voices)>0){
+			echo "<div id=\"admin_menu\"><ul>";
+			foreach ($voices as $voice){
+				echo '<li><a href="'.$voice["page"].'">'.$voice["label"].'</a></li>';
+			}
+			echo "</ul></div>";
+		}
+	}
+	
 }
 
 ?>

private/lib/gui/html.inclusion.php

@@ -10,6 +10,8 @@ GUIHandler::addStylesheet(GUIHandler::STYLESHEET_ADMIN, "normalize.css");
 
 GUIHandler::addStylesheet(GUIHandler::STYLESHEET_ADMIN, "chosen.css");
 
+GUIHandler::addStylesheet(GUIHandler::STYLESHEET_ADMIN, "admin.css");
+
 
 GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_ADMIN, "jquery.js");
 

public/admin/index.php

@@ -12,20 +12,5 @@ if (!AdminLoginManager::isLogged()){
 	GUIHandler::redirect("admin/login.php");
 }
 
-
+MenuGenerator::generateMenu();
 ?>
-<div class="menu">
-	<ul>
-		<?php 
-			$voices = MenuGenerator::getVoices();
-			if (sizeof($voices)>0){
-				foreach ($voices as $voice){
-					echo '<li><a href="'.$voice["page"].'">'.$voice["label"].'</a></li>';
-				}
-			}
-			else {
-				echo "noVoices";
-			}
-		?>
-	</ul>
-</div>

public/admin/roleAdmin.php

@@ -0,0 +1,17 @@
+<?php
+/*
+Author: 		Riccardo Di Dato
+Creation Date:	14/gen/2016
+*/
+
+require_once(dirname(__FILE__)."/../load.php");
+
+GUIHandler::generateHtmlHeaders(array(),true);
+
+if (!AdminLoginManager::isLogged()){
+	GUIHandler::redirect("admin/login.php");
+}
+
+MenuGenerator::generateMenu();
+
+?>

public/style/admin.css

@@ -0,0 +1,6 @@
+@CHARSET "UTF-8";
+
+#admin_menu{position:absolute; left:0; top:0; bottom:0; width:300px; background-color:#000000; display:inline-block;}
+
+#admin_menu ul{list-style: none; width:100;}
+#admin_menu ul li{width:100; height:50px;}