From 332d5deaeba1039d8083f1de54161806cfd1849d Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Fri, 20 Jul 2012 17:02:13 +0200
Subject: [PATCH] yweb: fix directory for records in timersettings; move block
 to Y_neutrino_Blocks.txt

Origin commit data
------------------
Commit: https://github.com/neutrino-images/ni-neutrino/commit/eee9f078b0a1c6e80b7126c5a69479a08f93c1e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-07-20 (Fri, 20 Jul 2012)

Origin message was:
------------------
- yweb: fix directory for records in timersettings; move block to Y_neutrino_Blocks.txt
---
 src/nhttpd/web/Y_Timer_Edit.yhtm       | 13 +------
 src/nhttpd/web/Y_Tools_Timer_Sync.yhtm | 14 +-------
 src/nhttpd/web/Y_neutrino_Blocks.txt   | 49 ++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/src/nhttpd/web/Y_Timer_Edit.yhtm b/src/nhttpd/web/Y_Timer_Edit.yhtm
index 5a7f4a228..9f0aadb48 100644
--- a/src/nhttpd/web/Y_Timer_Edit.yhtm
+++ b/src/nhttpd/web/Y_Timer_Edit.yhtm
@@ -164,18 +164,7 @@ function init()
 			<tr id="RecDirRow" style="display:none">
 				<td>{=L:live.timer_edit.rec_dir=}:</td>
 				<td>
-				<select name="rec_dir" id="rec_dir" class="y_live_button">
-				<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_0;/mnt/filme~open=}" selected="selected">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_0;/mnt/filme~cache=}</option>
-				<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_1;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_1;/mnt/filme~cache=}</option>
-				<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_2;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_2;/mnt/filme~cache=}</option>
-				<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_3;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_3;/mnt/filme~cache=}</option>
-				<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_4;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_4;/mnt/filme~cache=}</option>
-				<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_5;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_5;/mnt/filme~cache=}</option>
-				<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_6;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_6;/mnt/filme~cache=}</option>
-				<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_7;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_7;/mnt/filme~cache=}</option>
-				<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_8;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_8;/mnt/filme~cache=}</option>
-				<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_9;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_9;/mnt/filme~cache=}</option>
-				</select>
+				{=include-block:Y_neutrino_Blocks.txt;neutrino_list_record_dirs=}
 				</td>
 			</tr>
 		</table>
diff --git a/src/nhttpd/web/Y_Tools_Timer_Sync.yhtm b/src/nhttpd/web/Y_Tools_Timer_Sync.yhtm
index 0ec1d2fb4..d4159530a 100644
--- a/src/nhttpd/web/Y_Tools_Timer_Sync.yhtm
+++ b/src/nhttpd/web/Y_Tools_Timer_Sync.yhtm
@@ -23,19 +23,7 @@
 			<input type="radio" name="planer" value="slave" disabled="disabled"/>Slave box<br/>
 			<input type="radio" name="planer" value="slave" disabled="disabled"/>Test<br/> -->
 			{=L:live.timer-sync.rec_dir=}:
-				<select name="rec_dir" class="y_live_button">
-				<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_0;/mnt/filme~open=}" selected="selected">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_0;/mnt/filme~cache=}</option>
-				<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_1;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_1;/mnt/filme~cache=}</option>
-				<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_2;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_2;/mnt/filme~cache=}</option>
-				<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_3;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_3;/mnt/filme~cache=}</option>
-				<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_4;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_4;/mnt/filme~cache=}</option>
-				<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_5;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_5;/mnt/filme~cache=}</option>
-				<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_6;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_6;/mnt/filme~cache=}</option>
-				<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_7;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_7;/mnt/filme~cache=}</option>
-				<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_8;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_8;/mnt/filme~cache=}</option>
-				<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_9;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_9;/mnt/filme~cache=}</option>
-				</select>
-
+			{=include-block:Y_neutrino_Blocks.txt;neutrino_list_record_dirs=}
 			<br/><a href="javascript:top.top_main.prim_menu.nav('settings', 'Y_Settings_Timer.yhtm');" class="inlink">{=L:live.timer-sync.settings=}</a>&nbsp;<input type="checkbox" name="debug" value="1"/>{=L:live.timer-sync.debugging=}</td>
 		</tr>
 		</table>
diff --git a/src/nhttpd/web/Y_neutrino_Blocks.txt b/src/nhttpd/web/Y_neutrino_Blocks.txt
index c7023c6bb..5c953b869 100644
--- a/src/nhttpd/web/Y_neutrino_Blocks.txt
+++ b/src/nhttpd/web/Y_neutrino_Blocks.txt
@@ -1583,3 +1583,52 @@ start-block~neutrino_esound_save_settings
 {=ini-set:/var/tuxbox/config/neutrino.conf;esound_port;{=esound_port=}=}
 
 end-block~neutrino_esound_save_settings
+
+# ------- list possible directorys for records
+start-block~neutrino_list_record_dirs
+<select name="rec_dir" id="rec_dir" class="y_live_button">
+	<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_recordingdir~open=}" selected="selected">
+		{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_recordingdir~cache=}
+	</option>
+	{=if-empty:{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_0~cache=}~~
+	<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_0~cache=}">
+		{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_0~cache=}
+	</option>
+	=}
+	{=if-empty:{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_1~cache=}~~
+	<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_1~cache=}">
+		{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_1~cache=}
+	</option>
+	=}
+	{=if-empty:{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_2~cache=}~~
+	<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_2~cache=}">
+		{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_2~cache=}
+	</option>
+	=}
+	{=if-empty:{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_3~cache=}~~
+	<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_3~cache=}">
+		{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_3~cache=}
+	</option>
+	=}
+	{=if-empty:{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_4~cache=}~~
+	<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_4~cache=}">
+		{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_4~cache=}
+	</option>
+	=}
+	{=if-empty:{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_5~cache=}~~
+	<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_5~cache=}">
+		{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_5~cache=}
+	</option>
+	=}
+	{=if-empty:{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_6~cache=}~~
+	<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_6~cache=}">
+		{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_6~cache=}
+	</option>
+	=}
+	{=if-empty:{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_7~cache=}~~
+	<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_7~cache=}">
+		{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_7~cache=}
+	</option>
+	=}
+</select>
+end-block~neutrino_list_record_dirs