3 files changed, 29 insertions, 16 deletions
diff --git a/tpl/import.html b/tpl/import.html
index 6c4f9421..071e1160 100644
--- a/tpl/import.html
+++ b/tpl/import.html
@@ -3,19 +3,31 @@
 <head>{include="includes"}</head>
 <body onload="document.uploadform.filetoupload.focus();">
 <div id="pageheader">
-        {include="page.header"}
+  {include="page.header"}
-        <div id="uploaddiv">
+  <div id="uploaddiv">
-        Import Netscape HTML bookmarks (as exported from Firefox/Chrome/Opera/Delicious/Diigo...) (Max: {$maxfilesize} bytes).
+    Import Netscape HTML bookmarks (as exported from Firefox/Chrome/Opera/Delicious/Diigo...) (Max: {$maxfilesize} bytes).
-        <form method="POST" action="?do=upload" enctype="multipart/form-data" name="uploadform" id="uploadform">
+    <form method="POST" action="?do=import" enctype="multipart/form-data"
-            <input type="hidden" name="token" value="{$token}">
+          name="uploadform" id="uploadform">
-            <input type="file" name="filetoupload">
+      <input type="hidden" name="token" value="{$token}">
-            <input type="hidden" name="MAX_FILE_SIZE" value="{$maxfilesize}">
+      <input type="hidden" name="MAX_FILE_SIZE" value="{$maxfilesize}">
-            <input type="submit" name="import_file" value="Import" class="bigbutton"><br>
+      <input type="file" name="filetoupload">
-            <input type="checkbox" name="private" id="private"><label for="private">&nbsp;Import all links as private</label><br>
+      <input type="submit" name="import_file" value="Import" class="bigbutton"><br>
-            <input type="checkbox" name="overwrite" id="overwrite"><label for="overwrite">&nbsp;Overwrite existing links</label>
-        </form>
+      <label for="privacy">&nbsp;Visibility:</label><br>
-        </div>
+      <input type="radio" name="privacy" value="default" checked="true">
+      &nbsp;Use values from the imported file, default to public<br>
+      <input type="radio" name="privacy" value="private">
+      &nbsp;Import all bookmarks as private<br>
+      <input type="radio" name="privacy" value="public">
+      &nbsp;Import all bookmarks as public<br>
+      <input type="checkbox" name="overwrite" id="overwrite">
+      <label for="overwrite">&nbsp;Overwrite existing bookmarks</label><br>
+      <label for="default_tags">&nbsp;Add default tags</label>
+      <input type="text" name="default_tags" id="default_tags">
+    </form>
+  </div>
 </div>
 {include="page.footer"}
 </body>
-</html>
-\ No newline at end of file
+</html>
diff --git a/tpl/pluginsadmin.html b/tpl/pluginsadmin.html
index 5ddcf061..966360ea 100644
--- a/tpl/pluginsadmin.html
+++ b/tpl/pluginsadmin.html
@@ -104,11 +104,12 @@
                  <div class="plugin_parameter">
                    <div class="float_label">
                      <label for="{$key}">
-                        <code>{$key}</code>
+                        <code>{$key}</code><br>
+                        {$value.desc}
                      </label>
                    </div>
                    <div class="float_input">
-                      <input name="{$key}" value="{$value}" id="{$key}"/>
+                      <input name="{$key}" value="{$value.value}" id="{$key}"/>
                    </div>
                  </div>
                {/loop}
diff --git a/tpl/tools.html b/tpl/tools.html
index 9e45caad..8e285f44 100644
--- a/tpl/tools.html
+++ b/tpl/tools.html
@@ -9,7 +9,7 @@
                <br><br>
                <a href="?do=pluginadmin"><b>Plugin administration</b><span>: Enable, disable and configure plugins.</span></a>
    <br><br>
-                {if="$openshaarli"}<a href="?do=changepasswd"><b>Change password</b><span>: Change your password.</span></a>
+                {if="!$openshaarli"}<a href="?do=changepasswd"><b>Change password</b><span>: Change your password.</span></a>
    <br><br>{/if}
                <a href="?do=changetag"><b>Rename/delete tags</b><span>: Rename or delete a tag in all links</span></a>
    <br><br>

diff --git a/tpl/import.html b/tpl/import.html index 6c4f9421..071e1160 100644 --- a/tpl/import.html +++ b/tpl/import.html
@@ -3,19 +3,31 @@
3	<head>{include="includes"}</head>	3	<head>{include="includes"}</head>
4	<body onload="document.uploadform.filetoupload.focus();">	4	<body onload="document.uploadform.filetoupload.focus();">
5	<div id="pageheader">	5	<div id="pageheader">
6	{include="page.header"}	6	{include="page.header"}
7	<div id="uploaddiv">	7	<div id="uploaddiv">
8	Import Netscape HTML bookmarks (as exported from Firefox/Chrome/Opera/Delicious/Diigo...) (Max: {$maxfilesize} bytes).	8	Import Netscape HTML bookmarks (as exported from Firefox/Chrome/Opera/Delicious/Diigo...) (Max: {$maxfilesize} bytes).
9	<form method="POST" action="?do=upload" enctype="multipart/form-data" name="uploadform" id="uploadform">	9	<form method="POST" action="?do=import" enctype="multipart/form-data"
10	<input type="hidden" name="token" value="{$token}">	10	name="uploadform" id="uploadform">
11	<input type="file" name="filetoupload">	11	<input type="hidden" name="token" value="{$token}">
12	<input type="hidden" name="MAX_FILE_SIZE" value="{$maxfilesize}">	12	<input type="hidden" name="MAX_FILE_SIZE" value="{$maxfilesize}">
13	<input type="submit" name="import_file" value="Import" class="bigbutton"><br>	13	<input type="file" name="filetoupload">
14	<input type="checkbox" name="private" id="private"><label for="private"> Import all links as private</label><br>	14	<input type="submit" name="import_file" value="Import" class="bigbutton"><br>
15	<input type="checkbox" name="overwrite" id="overwrite"><label for="overwrite"> Overwrite existing links</label>	15
16	</form>	16	<label for="privacy"> Visibility:</label><br>
17	</div>	17	<input type="radio" name="privacy" value="default" checked="true">
		18	Use values from the imported file, default to public<br>
		19	<input type="radio" name="privacy" value="private">
		20	Import all bookmarks as private<br>
		21	<input type="radio" name="privacy" value="public">
		22	Import all bookmarks as public<br>
		23
		24	<input type="checkbox" name="overwrite" id="overwrite">
		25	<label for="overwrite"> Overwrite existing bookmarks</label><br>
		26	<label for="default_tags"> Add default tags</label>
		27	<input type="text" name="default_tags" id="default_tags">
		28	</form>
		29	</div>
18	</div>	30	</div>
19	{include="page.footer"}	31	{include="page.footer"}
20	</body>	32	</body>
21	</html> \ No newline at end of file	33	</html>


diff --git a/tpl/pluginsadmin.html b/tpl/pluginsadmin.html index 5ddcf061..966360ea 100644 --- a/tpl/pluginsadmin.html +++ b/tpl/pluginsadmin.html
@@ -104,11 +104,12 @@
104	<div class="plugin_parameter">	104	<div class="plugin_parameter">
105	<div class="float_label">	105	<div class="float_label">
106	<label for="{$key}">	106	<label for="{$key}">
107	<code>{$key}</code>	107	<code>{$key}</code><br>
		108	{$value.desc}
108	</label>	109	</label>
109	</div>	110	</div>
110	<div class="float_input">	111	<div class="float_input">
111	<input name="{$key}" value="{$value}" id="{$key}"/>	112	<input name="{$key}" value="{$value.value}" id="{$key}"/>
112	</div>	113	</div>
113	</div>	114	</div>
114	{/loop}	115	{/loop}


diff --git a/tpl/tools.html b/tpl/tools.html index 9e45caad..8e285f44 100644 --- a/tpl/tools.html +++ b/tpl/tools.html
@@ -9,7 +9,7 @@
9	<br><br>	9	<br><br>
10	<a href="?do=pluginadmin"><b>Plugin administration</b><span>: Enable, disable and configure plugins.</span></a>	10	<a href="?do=pluginadmin"><b>Plugin administration</b><span>: Enable, disable and configure plugins.</span></a>
11	<br><br>	11	<br><br>
12	{if="$openshaarli"}<a href="?do=changepasswd"><b>Change password</b><span>: Change your password.</span></a>	12	{if="!$openshaarli"}<a href="?do=changepasswd"><b>Change password</b><span>: Change your password.</span></a>
13	<br><br>{/if}	13	<br><br>{/if}
14	<a href="?do=changetag"><b>Rename/delete tags</b><span>: Rename or delete a tag in all links</span></a>	14	<a href="?do=changetag"><b>Rename/delete tags</b><span>: Rename or delete a tag in all links</span></a>
15	<br><br>	15	<br><br>