From 649cde0b0e399217fd2ba25bf41483882d8e81f3 Mon Sep 17 00:00:00 2001
From: Sander van Leeuwen <sander@react.nl>
Date: Fri, 16 Jan 2015 17:12:51 +0100
Subject: Address pull comments

head.inc - Revert indenting
.gitignore - Add IDE name in comment
---
 .gitignore             |  1 +
 usr/local/www/head.inc | 48 ++++++++++++++++++++++++------------------------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index 09e544d..c6e1931 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,5 @@ upload.sh
 .buildpath
 .project
 .settings/
+# PhpStorm
 .idea
\ No newline at end of file
diff --git a/usr/local/www/head.inc b/usr/local/www/head.inc
index b64e74d..15ac3fa 100755
--- a/usr/local/www/head.inc
+++ b/usr/local/www/head.inc
@@ -424,33 +424,33 @@ foreach($noticeCategories as $category => $catNotices):?>
 <div class="container">
 	<header class="header">
 		<?=genhtmltitle($pgtitle);?>
-	<?php
-	/*
-	//FIXME
-	if (!$hide_service_status && !empty($shortcuts[$shortcut_section]['service'])) {
-		$ssvc = array();
-		switch ($shortcut_section) {
-			case "openvpn":
-				$ssvc = find_service_by_openvpn_vpnid($vpnid);
-				break;
-			case "captiveportal":
-				$ssvc = find_service_by_cp_zone($cpzone);
-				break;
-			default:
-				$ssvc = find_service_by_name($shortcuts[$shortcut_section]['service']);
+<?php
+/*
+//FIXME
+if (!$hide_service_status && !empty($shortcuts[$shortcut_section]['service'])) {
+	$ssvc = array();
+	switch ($shortcut_section) {
+		case "openvpn":
+			$ssvc = find_service_by_openvpn_vpnid($vpnid);
+			break;
+		case "captiveportal":
+			$ssvc = find_service_by_cp_zone($cpzone);
+			break;
+		default:
+			$ssvc = find_service_by_name($shortcuts[$shortcut_section]['service']);
 
-		}
-		if (!empty($ssvc)) {
-			echo get_service_status_icon($ssvc, false);
-			echo get_service_control_links($ssvc, true);
-		}
 	}
+	if (!empty($ssvc)) {
+		echo get_service_status_icon($ssvc, false);
+		echo get_service_control_links($ssvc, true);
+	}
+}
 
-	echo get_shortcut_main_link($shortcut_section, true);
-	echo get_shortcut_status_link($shortcut_section, true);
-	echo get_shortcut_log_link($shortcut_section, true);
-	*/
-	?>
+echo get_shortcut_main_link($shortcut_section, true);
+echo get_shortcut_status_link($shortcut_section, true);
+echo get_shortcut_log_link($shortcut_section, true);
+*/
+?>
 
 	<?php if(! $g['disablehelpicon']): ?>
 		<a href="<?=$helpurl?>" title="<?=gettext("Help for items on this page")?>" class="help-icon">
-- 
cgit v1.1