From 84bf8d2c25259402cf38885fc84496f1f81de593 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 21 Aug 2007 08:55:51 +0000
Subject: [PATCH] Removed Expert mode. Moved schedule options out of table.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@7085 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 plugins/addons/gotomasses/class_goto_task.inc |  11 --
 plugins/addons/gotomasses/goto_task.tpl       | 120 +++++-------------
 2 files changed, 30 insertions(+), 101 deletions(-)

diff --git a/plugins/addons/gotomasses/class_goto_task.inc b/plugins/addons/gotomasses/class_goto_task.inc
index a4b540561..0fd58f422 100644
--- a/plugins/addons/gotomasses/class_goto_task.inc
+++ b/plugins/addons/gotomasses/class_goto_task.inc
@@ -7,7 +7,6 @@ class goto_task extends plugin
   var $plDescription  = "This does something";
  
   var $parent   = NULL;
-  var $Expert   = FALSE;
  
   var $Minute   = "*";
   var $Hour     = "*";
@@ -39,11 +38,6 @@ class goto_task extends plugin
           trigger_error("Missing parameter: '".$attr."' for goto_task contruction.");
         }else{
           $this->$attr = $data[$attr];
-  
-          /* Check if given value will be selectable via dropdown menus, else enable expert mode */
-          if(in_array($attr, array("Minute","Hour","Day","Month","Weekday")) && !isset($tmp[$attr][$data[$attr]])){
-            $this->Expert = TRUE;
-          }
         }
       }
     }else{
@@ -153,7 +147,6 @@ class goto_task extends plugin
     $smarty->assign("Months"  , $tmp['Month']);
     $smarty->assign("Weekdays", $tmp['Weekday']);
     $smarty->assign("OGroups" , $this->OGroups);
-    $smarty->assign("Expert"  , $this->Expert);
     $smarty->assign("Actions"     , $this->Actions);
     $smarty->assign("Target_list" , $divlist->DrawList());
     $smarty->assign("new"      , $this->new);
@@ -192,10 +185,6 @@ class goto_task extends plugin
   {
     if(isset($_POST['goto_task_posted'])){
       plugin::save_object();
-
-      if(isset($_POST['ToggleExpertMode'])){
-        $this->Expert = !$this->Expert;
-      }
     }
   }  
 
diff --git a/plugins/addons/gotomasses/goto_task.tpl b/plugins/addons/gotomasses/goto_task.tpl
index ccd46024b..ee47505d0 100644
--- a/plugins/addons/gotomasses/goto_task.tpl
+++ b/plugins/addons/gotomasses/goto_task.tpl
@@ -59,96 +59,36 @@
 	</tr>
 	<tr>
 		<td colspan="2">
-			{if $Expert}
-			<input type='submit' name='ToggleExpertMode' value="{t}Normal mode{/t}">
-			<table>
-				<tr>
-					<td style='width:20%;'>
-						{t}Minute{/t}&nbsp;
-						{render acl=$MinuteACL}
-						<input type='text' name='Minute' value="{$Minute}" style='width:50px;'>
-						{/render}
-					</td>
-					<td style='width:20%;'>
-						{render acl=$HourACL}
-						{t}Hour{/t}&nbsp;
-						<input type='text' name='Hour' value="{$Hour}" style='width:50px;'>
-						{/render}
-					</td>
-					<td style='width:20%;'>
-						{t}Day{/t}&nbsp;
-						{render acl=$DayACL}
-						<input type='text' name='Day' value="{$Day}" style='width:50px;'>
-						{/render}
-					</td>
-					<td style='width:20%;'>
-						{t}Month{/t}&nbsp;
-						{render acl=$MonthACL}
-						<input type='text' name='Month' value="{$Month}" style='width:50px;'>
-						{/render}
-					</td>
-					<td style='width:20%;'>
-						{t}Week day{/t}&nbsp;
-						{render acl=$WeekdayACL}
-						<input type='text' name='Weekday' value="{$Weekday}" style='width:50px;'>
-						{/render}
-					</td>
-				</tr>
-			</table>
-			{else}
-
-			<input type='submit' name='ToggleExpertMode' value="{t}Expert mode{/t}">
-			<table>
-				<tr>
-					<td>{t}Minute{/t}
-					</td>
-					<td>
-						{render acl=$MinuteACL}
-						<select name='Minute'>
-							{html_options options=$Minutes selected=$Minute}
-						</select>
-						{/render}
-					</td>
-					<td>{t}Hour{/t}
-					</td>
-					<td>
-						{render acl=$HourACL}
-						<select name='Hour'>
-							{html_options options=$Hours selected=$Hour}
-						</select>
-						{/render}
-					</td>
-					<td>{t}Day{/t}
-					</td>
-					<td>
-						{render acl=$DayACL}
-						<select name='Day'>
-							{html_options options=$Days selected=$Day}
-						</select>
-						{/render}
-					</td>
-					<td>{t}Month{/t}
-					</td>
-					<td>
-						{render acl=$MonthACL}
-						<select name='Month'>
-							{html_options options=$Months selected=$Month}
-						</select>
-						{/render}
-					</td>
-					<td>{t}Week day{/t}
-					</td>
-					<td>
-						{render acl=$WeekdayACL}
-						<select name='Weekday'>
-							{html_options options=$Weekdays selected=$Weekday}
-						</select>
-						{/render}
-					</td>
-				</tr>
-			</table>
-			{/if}
-	
+			{t}Minute{/t}
+			{render acl=$MinuteACL}
+				<select name='Minute'>
+				{html_options options=$Minutes selected=$Minute}
+				</select>
+			{/render}
+			{t}Hour{/t}
+			{render acl=$HourACL}
+				<select name='Hour'>
+				{html_options options=$Hours selected=$Hour}
+				</select>
+			{/render}
+			{t}Day{/t}
+			{render acl=$DayACL}
+				<select name='Day'>
+				{html_options options=$Days selected=$Day}
+				</select>
+			{/render}
+			{t}Month{/t}
+			{render acl=$MonthACL}
+				<select name='Month'>
+				{html_options options=$Months selected=$Month}
+				</select>
+			{/render}
+			{t}Week day{/t}
+			{render acl=$WeekdayACL}
+				<select name='Weekday'>
+				{html_options options=$Weekdays selected=$Weekday}
+				</select>
+			{/render}
 		</td>
 	</tr>
 </table>
-- 
2.30.2