updating the templates. script has been fixed

to populate fields like priority and permissions
from the DB rather than fake settings.
add_job has been much improved.

svn path=/; revision=175

2 files changed, 207 insertions, 24 deletions

diff --git a/scire/.smarty/templates/add_job.tpl b/scire/.smarty/templates/add_job.tpl
index 84d6ac1..bf4a997 100755
--- a/scire/.smarty/templates/add_job.tpl
+++ b/scire/.smarty/templates/add_job.tpl
@@ -120,6 +120,189 @@
 <hr>
 Job Description: <br><textarea name="description" rows="3" cols="40"></textarea><br>
 Recurring stuff here.<br>
+<table>
+<tr><td>Minute(s):<br>
+<select multiple name=minute1 size=10>
+<option value=*> Every Minute
+<option value=*/2> Every Other Minute
+<option value=*/5> Every Five Minutes
+<option value=*/10> Every Ten Minutes
+<option value=*/15> Every Fifteen Minutes
+<option value=0> 0
+<option value=1> 1
+
+<option value=2> 2
+<option value=3> 3
+<option value=4> 4
+<option value=5> 5
+<option value=6> 6
+<option value=7> 7
+<option value=8> 8
+<option value=9> 9
+<option value=10> 10
+
+<option value=11> 11
+<option value=12> 12
+<option value=13> 13
+<option value=14> 14
+<option value=15> 15
+<option value=16> 16
+<option value=17> 17
+<option value=18> 18
+<option value=19> 19
+
+<option value=20> 20
+<option value=21> 21
+<option value=22> 22
+<option value=23> 23
+<option value=24> 24
+<option value=25> 25
+<option value=26> 26
+<option value=27> 27
+<option value=28> 28
+
+<option value=29> 29
+<option value=30> 30
+<option value=31> 31
+<option value=32> 32
+<option value=33> 33
+<option value=34> 34
+<option value=35> 35
+<option value=36> 36
+<option value=37> 37
+
+<option value=38> 38
+<option value=39> 39
+<option value=40> 40
+<option value=41> 41
+<option value=42> 42
+<option value=43> 43
+<option value=44> 44
+<option value=45> 45
+<option value=46> 46
+
+<option value=47> 47
+<option value=48> 48
+<option value=49> 49
+<option value=50> 50
+<option value=51> 51
+<option value=52> 52
+<option value=53> 53
+<option value=54> 54
+<option value=55> 55
+
+<option value=56> 56
+<option value=57> 57
+<option value=58> 58
+<option value=59> 59
+</select><br>
+</td>
+<td>Hour(s):<br>
+<select multiple name=hour1 size=5>
+<option value=*> Every Hour
+<option value=*/2> Every Other Hour
+
+<option value=*/4> Every Four Hours
+<option value=*/6> Every Six Hours
+<option value=0> 0 = 12 AM/Midnight
+<option value=1> 1 = 1 AM
+<option value=2> 2 = 2 AM
+<option value=3> 3 = 3 AM
+<option value=4> 4 = 4 AM
+<option value=5> 5 = 5 AM
+<option value=6> 6 = 6 AM
+
+<option value=7> 7 = 7 AM
+<option value=8> 8 = 8 AM
+<option value=9> 9 = 9 AM
+<option value=10> 10 = 10 AM
+<option value=11> 11 = 11 AM
+<option value=12> 12 = 12 PM/Noon
+<option value=13> 13 = 1 PM
+<option value=14> 14 = 2 PM
+<option value=15> 15 = 3 PM
+
+<option value=16> 16 = 4 PM
+<option value=17> 17 = 5 PM
+<option value=18> 18 = 6 PM
+<option value=19> 19 = 7 PM
+<option value=20> 20 = 8 PM
+<option value=21> 21 = 9 PM
+<option value=22> 22 = 10 PM
+<option value=23> 23 = 11 PM
+</select>
+
+<br><br>Day(s):<br>
+<select multiple name=day1 size=5>
+<option value=*> Every Day
+<option value=1> 1
+<option value=2> 2
+<option value=3> 3
+<option value=4> 4
+<option value=5> 5
+<option value=6> 6
+
+<option value=7> 7
+<option value=8> 8
+<option value=9> 9
+<option value=10> 10
+<option value=11> 11
+<option value=12> 12
+<option value=13> 13
+<option value=14> 14
+<option value=15> 15
+
+<option value=16> 16
+<option value=17> 17
+<option value=18> 18
+<option value=19> 19
+<option value=20> 20
+<option value=21> 21
+<option value=22> 22
+<option value=23> 23
+<option value=24> 24
+
+<option value=25> 25
+<option value=26> 26
+<option value=27> 27
+<option value=28> 28
+<option value=29> 29
+<option value=30> 30
+<option value=31> 31
+</select><br><br>
+</td><td>Months(s):<br>
+
+<select multiple name=month1 size=5>
+<option value=*> Every Month
+<option value=1> January
+<option value=2> February
+<option value=3> March
+<option value=4> April
+<option value=5> May
+<option value=6> June
+<option value=7> July
+
+<option value=8> August
+<option value=9> September
+<option value=10> October
+<option value=11> November
+<option value=12> December
+</select>
+<br><br>Weekday(s):<br>
+<select multiple name=weekday1 size=5>
+<option value=*> Every Weekday
+<option value=0> Sunday
+
+<option value=1> Monday
+<option value=2> Tuesday
+<option value=3> Wednesday
+<option value=4> Thursday
+<option value=5> Friday
+<option value=6> Saturday
+</select>
+</td></tr>
+</table>
+<hr>
 Job dependency stuff here.<br>
 Set notification email address: <input type="radio" name="notify_addr" value="{$useremail}">{$useremail}</input><input type="radio" name="notify_addr" value="new"><input type="text" name="notify_new"></input>
 <input type="submit" name="ADD" value="ADD JOB!!!">
diff --git a/scire/.smarty/templates/script.tpl b/scire/.smarty/templates/script.tpl
index d2c5692..4c93fe7 100644
--- a/scire/.smarty/templates/script.tpl
+++ b/scire/.smarty/templates/script.tpl
@@ -19,29 +19,26 @@
 	<td colspan="3">Manual: <input type="text" id="runas" name="runas" /></td>
   </tr>
   <tr>
-  	<td><input type="radio" name="runas_radio" value="root">root</td>
-	<td><input type="radio" name="runas_radio" value="nobody">nobody</td>
-	<td><input type="radio" name="runas_radio" value="httpd">httpd</td>
-	<td><input type="radio" name="runas_radio" value="apache">apache</td>
+  	<td><input type="radio" name="runas_radio" value="root">root
+	    <input type="radio" name="runas_radio" value="nobody">nobody</td>
+	<td><input type="radio" name="runas_radio" value="httpd">httpd
+	    <input type="radio" name="runas_radio" value="apache">apache</td>
   </tr>
   <tr>
 	<td><label for="priority">Recommended Priority:</label></td>
 	<td><select name="priority" size="1">
-	<option value="1">1</option>
-	<option value="2">2</option>
-	<option value="3">3</option>
-	<option value="4">4</option>
-	<option value="5">5</option>
-	<option value="6">6</option>
-	<option value="7">7</option>
-	<option value="8">8</option>
-	<option value="9">9</option>
+	{foreach from=$priorities item=pri key=key}
+	<option value="{$pri}">{$pri}</option>
+	{/foreach}
 	</select>
 	</td> 
 	<td><label for="permission">Recommended Permission:</label></td>
-	<td><select id="permission" name="permission" size="1">
-	<option value="this_is_fake" selected="selected">Installation</option>
-	    </select>
+	<td>
+	  <select name="permission" size="7">
+	  {foreach from=$perms item=perm key=id}
+		<option value="{$perm}">{$perm}</option>
+	  {/foreach}
+	  </select>
 	</td>
   </tr>
   <tr>
@@ -49,17 +46,16 @@
   </tr>
   <tr>
     <td>*Actual Script to run on client: </td>
-    <td><input type="radio" name="script_data_type" value="load">Load from file <input type="upload" name="script_data_upload"></td>
+    <td><input type="radio" name="script_data_type" value="load" disabled>Load from file <input type="upload" name="script_data_upload"></td>
   </tr>
   <tr>
     <td></td>
-	<td><input type="radio" name="script_data_type" value="manual">Input manually below</td>
+	<td><input type="radio" name="script_data_type" value="manual" checked>Input manually below</td>
   </tr>
   <tr>
-    <td colspan="2"><textarea name="script_data_manual" rows="10" cols="80">blah blah
+    <td colspan="2"><textarea name="script_data_manual" rows="10" cols="80" >
 #!/bin/bash
 emerge %%package%%
-echo "that was some cool dynamic content!"
 	</textarea> </td>
   </tr>
   
@@ -74,19 +70,23 @@ echo "that was some cool dynamic content!"
     <th>Dynamic Tag</th><th>Default Value</th>
   </tr>
   <tr>
-    <td>%%package%%</td><td><input type="text" name="%%package%%" value="gaim" /></td>
+    <td>%%package%%</td><td><input type="text" name="%%package%%" value="gaim" disabled /></td>
   </tr>
     <tr>
   <td><hr></td>
   </tr>
   <tr>
-    <td>Post Processing Script:</td><td><input type="radio" name="pps_type" value="none">No post-processing needed, this script just returns.</td>
+    <td>Success return code (default 0): <input type="text" name="success_code" value="0">
+	</td>
+  </tr>
+  <tr>
+    <td>Post Processing Script:</td><td><input type="radio" name="pps_type" value="none" checked>No post-processing needed, this script just returns.</td>
   </tr>
   <tr>
-    <td></td><td><input type="radio" name="pps_type" value="load">Load from file: <input type="upload" name="pps_load"></td>
+    <td></td><td><input type="radio" name="pps_type" value="load" disabled >Load from file: <input type="upload" name="pps_load"></td>
   </tr>
   <tr>
-    <td></td><td><input type="radio" name="pps_type" value="manual">Input Manually below</td>
+    <td></td><td><input type="radio" name="pps_type" value="manual" >Input Manually below</td>
   </tr>
   <tr>
     <td colspan="2"><textarea name="pps_data" rows="6" cols="80"></textarea></td>