From 0a97f5724aa2efb7fb4af23c1a40b4f1ed5f3f8c Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Fri, 25 Oct 2013 10:15:26 +0200
Subject: [PATCH] Few more changes

- some views didn't have the menu element yet
---
 app/View/Servers/pull.ctp                    | 9 +++------
 app/View/Servers/push.ctp                    | 9 +++------
 app/View/ShadowAttributes/add_attachment.ctp | 2 +-
 app/View/ShadowAttributes/index.ctp          | 1 -
 app/View/Users/memberslist.ctp               | 2 +-
 app/View/Whitelists/admin_index.ctp          | 2 +-
 6 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/app/View/Servers/pull.ctp b/app/View/Servers/pull.ctp
index 638e1b85a..84f10580d 100755
--- a/app/View/Servers/pull.ctp
+++ b/app/View/Servers/pull.ctp
@@ -22,9 +22,6 @@ else:?>
 	<?php
 endif;?>
 </div>
-<div class="actions <?php echo $debugMode;?>">
-	<ul class="nav nav-list">
-		<li class="active"><?php echo $this->Html->link('List Servers', array('controller' => 'servers', 'action' => 'index'));?></li>
-		<li><?php if ($isAclAdd && $me['org'] == 'ADMIN') echo $this->Html->link('New Server', array('controller' => 'servers', 'action' => 'add')); ?></li>
-	</ul>
-</div>
\ No newline at end of file
+<?php 
+	echo $this->element('side_menu', array('menuList' => 'sync', 'menuItem' => 'pull'));
+?>
diff --git a/app/View/Servers/push.ctp b/app/View/Servers/push.ctp
index d08e2aa5c..50aee6a22 100755
--- a/app/View/Servers/push.ctp
+++ b/app/View/Servers/push.ctp
@@ -22,9 +22,6 @@ else:?>
 	<?php
 endif;?>
 </div>
-<div class="actions <?php echo $debugMode;?>">
-	<ul class="nav nav-list">
-		<li class="active"><?php echo $this->Html->link('List Servers', array('controller' => 'servers', 'action' => 'index'));?></li>
-		<li><?php if ($isAclAdd && $me['org'] == 'ADMIN') echo $this->Html->link('New Server', array('controller' => 'servers', 'action' => 'add')); ?></li>
-	</ul>
-</div>
\ No newline at end of file
+<?php 
+	echo $this->element('side_menu', array('menuList' => 'sync', 'menuItem' => 'push'));
+?>
\ No newline at end of file
diff --git a/app/View/ShadowAttributes/add_attachment.ctp b/app/View/ShadowAttributes/add_attachment.ctp
index 7b7e0ceba..5e841ab39 100644
--- a/app/View/ShadowAttributes/add_attachment.ctp
+++ b/app/View/ShadowAttributes/add_attachment.ctp
@@ -139,4 +139,4 @@ $(function(){
 );
 
 </script>
-<?php echo $this->Js->writeBuffer(); // Write cached scripts
\ No newline at end of file
+<?php echo $this->Js->writeBuffer(); // Write cached scripts
diff --git a/app/View/ShadowAttributes/index.ctp b/app/View/ShadowAttributes/index.ctp
index a2a08f302..93cc716ee 100644
--- a/app/View/ShadowAttributes/index.ctp
+++ b/app/View/ShadowAttributes/index.ctp
@@ -73,4 +73,3 @@
 <?php 
 	echo $this->element('side_menu', array('menuList' => 'event-collection', 'menuItem' => 'viewProposals'));
 ?>
-
diff --git a/app/View/Users/memberslist.ctp b/app/View/Users/memberslist.ctp
index 424fb6bd1..dbadcaa48 100755
--- a/app/View/Users/memberslist.ctp
+++ b/app/View/Users/memberslist.ctp
@@ -39,7 +39,7 @@ foreach ($graphData as $row) {
 		});
 		var panel1 = Ext.create('widget.panel', {
 			width: 800,
-			height: 900,
+			height: 950,
 			//title: 'Attributes by Organisation',
 			renderTo: 'graph',
 			layout: 'fit',
diff --git a/app/View/Whitelists/admin_index.ctp b/app/View/Whitelists/admin_index.ctp
index 4d45a5116..dd3284aaa 100755
--- a/app/View/Whitelists/admin_index.ctp
+++ b/app/View/Whitelists/admin_index.ctp
@@ -52,4 +52,4 @@ endforeach;?>
 </div>
 <?php 
 	echo $this->element('side_menu', array('menuList' => 'whitelist', 'menuItem' => 'index'));
-?>
\ No newline at end of file
+?>