* split template string into string for single line and textfield for multiline. Avoid carriage return by long timer title

* Add import module for XML-TV sources and template for scheme based programs.  New commands xn (new) xe (edit) xd (delete) xl (list) xt (manual update)

6 files changed, 50 insertions, 17 deletions

diff --git a/skins/deltab/widgets/string.tmpl b/skins/deltab/widgets/string.tmpl
index 81833fd..2749f58 100644
--- a/skins/deltab/widgets/string.tmpl
+++ b/skins/deltab/widgets/string.tmpl
@@ -10,12 +10,7 @@
         <?% val %?>
         </p>
         <?% ELSE %?>
-            <?% IF val.defined && ( val.length > 70 || val.search('\n') || param.type == 'text' ) %?>
-            <textarea style="height:10em;width:395px;" name="<?% data.NAME %?>"><?% val | replace("<br />","
-") %?></textarea>
-            <?% ELSE %?>
-            <input style="width:395px;" type="text" name="<?% data.NAME %?>" value="<?% val %?>" />
-            <?% END %?>
+        <input style="width:395px;" type="text" name="<?% data.NAME %?>" value="<?% val %?>" />
         <?% END %?>
     </td>
 </tr>
diff --git a/skins/deltab/widgets/textfield.tmpl b/skins/deltab/widgets/textfield.tmpl
new file mode 100644
index 0000000..81ebc8a
--- /dev/null
+++ b/skins/deltab/widgets/textfield.tmpl
@@ -0,0 +1,17 @@
+<!-- textfield -->
+<tr>
+    <td valign='top'>
+        <?% data.msg %?>
+    </td>
+    <td>
+        <?% val = cgi.param(data.NAME) || data.def %?>
+        <?% IF data.readonly %?>
+        <p style="width:395px;">
+        <?% val %?>
+        </p>
+        <?% ELSE %?>
+        <textarea style="height:7em;width:395px;" name="<?% data.NAME %?>"><?% val | replace("<br />","
+") %?></textarea>
+        <?% END %?>
+    </td>
+</tr>
diff --git a/skins/stone/widgets/string.tmpl b/skins/stone/widgets/string.tmpl
index a4b1a98..067404c 100644
--- a/skins/stone/widgets/string.tmpl
+++ b/skins/stone/widgets/string.tmpl
@@ -7,12 +7,7 @@
         <?% IF data.readonly %?>
         <?% val %?>
         <?% ELSE %?>
-            <?% IF val.defined && ( val.length > 70 || val.search('\n') || param.type == 'text' ) %?>
-            <textarea style="height:10em;width:395px;" name="<?% data.NAME %?>"><?% val | replace("<br />","
-") %?></textarea>
-            <?% ELSE %?>
-            <input style="width:395px;" type="text" name="<?% data.NAME %?>" value="<?% val %?>" />
-            <?% END %?>
+        <input style="width:395px;" type="text" name="<?% data.NAME %?>" value="<?% val %?>" />
         <?% END %?>
     </td>
 </tr>
diff --git a/skins/stone/widgets/textfield.tmpl b/skins/stone/widgets/textfield.tmpl
new file mode 100644
index 0000000..813fd2a
--- /dev/null
+++ b/skins/stone/widgets/textfield.tmpl
@@ -0,0 +1,14 @@
+<!-- textfield -->
+<?% global.widgetcount = global.widgetcount + 1 %?>
+<tr<?% ' class="two"' IF global.widgetcount mod 2 == 0 %?>>
+        <?% INCLUDE widgets/topic.inc abbr=data.msg %?>
+    <td>
+        <?% val = cgi.param(data.NAME) || data.def %?>
+        <?% IF data.readonly %?>
+        <?% val %?>
+        <?% ELSE %?>
+            <textarea style="height:5em;width:395px;" name="<?% data.NAME %?>"><?% val | replace("<br />","
+") %?></textarea>
+        <?% END %?>
+    </td>
+</tr>
diff --git a/skins/xstyle/widgets/string.tmpl b/skins/xstyle/widgets/string.tmpl
index 3a104cf..f8c4880 100644
--- a/skins/xstyle/widgets/string.tmpl
+++ b/skins/xstyle/widgets/string.tmpl
@@ -10,12 +10,7 @@
         <?% val %?>
         </span>
         <?% ELSE %?>
-            <?% IF (val && val.length > 30) || param.type == 'text' %?>
-            <textarea cols='50' rows='5' name="<?% data.NAME %?>" <?% FOREACH p = param.tags; "$p ";END %?>><?% val | replace("<br />","
-")%?></textarea>
-            <?% ELSE %?>
             <input type="text" name="<?% data.NAME %?>" value="<?% val %?>" <?% FOREACH p = param.tags; "$p ";END %?>>
-            <?% END %?>
         <?% END %?>
     </td>
 </tr>
diff --git a/skins/xstyle/widgets/textfield.tmpl b/skins/xstyle/widgets/textfield.tmpl
new file mode 100644
index 0000000..06296bf
--- /dev/null
+++ b/skins/xstyle/widgets/textfield.tmpl
@@ -0,0 +1,17 @@
+<!-- textfield -->
+<tr>
+    <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
+        <?% data.msg %?>
+    </td>
+    <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
+        <?% val = cgi.param(data.NAME) || data.def %?>
+        <?% IF data.readonly %?>
+        <span<?% FOREACH p = param.tags; "$p ";END %?>>
+        <?% val %?>
+        </span>
+        <?% ELSE %?>
+            <textarea cols='50' rows='5' name="<?% data.NAME %?>" <?% FOREACH p = param.tags; "$p ";END %?>><?% val | replace("<br />","
+")%?></textarea>
+        <?% END %?>
+    </td>
+</tr>