new templates

diff --git a/templates/admin/EDITFUNCTIONS.tmpl b/templates/admin/EDITFUNCTIONS.tmpl
new file mode 100755 (executable)
index 0000000..5fb9631
--- /dev/null
+++ b/templates/admin/EDITFUNCTIONS.tmpl
@@ -0,0 +1,126 @@
+<include "SETTINGS.template">
+
+<function EditStart(aAction, aHiddenFields, aHiddenValues)>
+    <form action="${config.docRoot}/admin/${aAction}" method="post">
+        <assign index="0">
+        <list aHiddenFields as i>
+          <input type="hidden" name="${i}" value="${aHiddenValues[index]}">
+          <assign index=utility.increment(index)>
+        </list>
+      <table border="0">
+</function>
+
+<function EditEnd()>
+      </table>
+    </form>
+</function>
+
+<function EditFieldStart(aLabel, aHint, aLabelClass, aValueClass)>
+  <tr>
+    <td align="right" class="${aLabelClass}">
+      <b>${aLabel}:</b>
+      <if aHint>
+        <br>
+        <span class="small">${aHint}</span>      
+      </if>
+    </td>
+    
+    <td class="${aValueClass}">
+</function>
+
+<function EditFieldEnd()>
+    </td>
+  </tr>
+</function>  
+
+<function EditSubmitButtonNormal(aLabel, aFieldName)>
+  <tr>
+    <td class="${TABLE_FOOT_CLASS}" colspan="2" align="right"> 
+      <input type="submit" name="${aFieldName}" value="${aLabel}">
+    </td>
+  </tr>
+</function>  
+
+
+<function EditReadonlyTextNormal(label, fieldcontent)>
+  <call EditFieldStart(label, "", "table-left", "listrow2")>
+      ${utility.encodeHTML(fieldcontent)}
+  <call EditFieldEnd()>
+</function>
+
+
+<function EditText(label, size, maxlength, fieldname, fieldcontent, aLabelClass, aValueClass)>
+  <call EditFieldStart(label, "", aLabelClass, aValueClass)>
+      <input type="text" size="${size}" maxlength="${maxlength}" name="${fieldname}" value="${utility.encodeHTML(fieldcontent)}">
+  <call EditFieldEnd()>
+</function>
+<function EditTextNormal(label, size, maxlength, fieldname, fieldcontent)>
+  <call EditText(label, size, maxlength, fieldname, fieldcontent, "table-left", "listrow2")>
+</function>
+<function EditTextHighlighted(label, size, maxlength, fieldname, fieldcontent)>
+  <call EditText(label, size, maxlength, fieldname, fieldcontent, "table-left-light", "listrow1")>
+</function>
+
+
+<function EditPassword(label, size, maxlength, fieldname, fieldcontent, aLabelClass, aValueClass)>
+  <call EditFieldStart(label, "", aLabelClass, aValueClass)>
+      <input type="password" size="${size}" maxlength="${maxlength}" name="${fieldname}" value="${utility.encodeHTML(fieldcontent)}">
+  <call EditFieldEnd()>
+</function>
+
+<function EditPasswordNormal(label, size, maxlength, fieldname, fieldcontent)>
+  <call EditPassword(label, size, maxlength, fieldname, fieldcontent, "table-left", "listrow2")>
+</function>
+<function EditPasswordHighlighted(label, size, maxlength, fieldname, fieldcontent)>
+  <call EditPassword(label, size, maxlength, fieldname, fieldcontent, "table-left-light", "listrow1")>
+</function>
+
+
+<function EditCheckbox(label, fieldname, fieldcontent, aLabelClass, aValueClass)>
+  <call EditFieldStart(label, "", aLabelClass, aValueClass)>
+      <input type="checkbox" name="${fieldname}" value="1"<if fieldcontent=="1"> checked</if>>&nbsp;&nbsp;
+  <call EditFieldEnd()>
+</function> 
+
+<function EditCheckboxNormal(label, fieldname, fieldcontent)>
+  <call EditCheckbox(label, fieldname, fieldcontent, "table-left", "listrow2")>
+</function>
+<function EditCheckboxHighlighted(label, fieldname, fieldcontent)>
+  <call EditCheckbox(label, fieldname, fieldcontent, "table-left-light", "listrow1")>
+</function>
+
+
+<function EditTextArea(label, aHint, cols, rows, fieldname, fieldcontent, aLabelClass, aValueClass)>
+  <call EditFieldStart(label, aHint, aLabelClass, aValueClass)>
+      <textarea cols="${cols}" rows="${rows}" name="${fieldname}" wrap="virtual">${utility.encodeHTML(fieldcontent)}</textarea>
+  <call EditFieldEnd()>
+</function>
+
+<function EditTextAreaNormal(label, aHint, cols, rows, fieldname, fieldcontent)>
+  <call EditTextArea(label, aHint, cols, rows, fieldname, fieldcontent, "table-left", "listrow2")>
+</function>
+<function EditTextAreaHighlighted(label, size, maxlength, fieldname, fieldcontent)>
+  <call EditTextArea(label, aHint, cols, rows, fieldname, fieldcontent, "table-left-light", "listrow1")>
+</function>
+
+
+
+
+<function EditPullDown (label, fieldname, entrieslist, keyfield, valuefield, value, langprefix, aLabelClass, aValueClass)>
+  <call EditFieldStart(label, "", aLabelClass, aValueClass)>
+       <select name="${fieldname}">
+         <list entrieslist as a>
+           <option value="${a[keyfield]}" <if (a[keyfield] == value)>selected</if>><if langprefix>${lang(langprefix+a[valuefield])}<else>${a[valuefield]}</if></option>
+         </list>
+       </select>
+  <call EditFieldEnd()>
+</function>   
+
+<function EditPullDownNormal(label, fieldname, entrieslist, keyfield, valuefield, value, langprefix)>
+  <call EditPullDown(label, fieldname, entrieslist, keyfield, valuefield, value, langprefix, "table-left", "listrow2")>
+</function>
+<function EditPullDownHighlighted(label, fieldname, entrieslist, keyfield, valuefield, value, langprefix)>
+  <call EditPullDown(label, fieldname, entrieslist, keyfield, valuefield, value, langprefix, "table-left-light", "listrow1")>
+</function>
+
+

diff --git a/templates/admin/FUNCTIONS.tmpl b/templates/admin/FUNCTIONS.tmpl
index b453a50..cf86d8d 100755 (executable)
--- a/templates/admin/FUNCTIONS.tmpl
+++ b/templates/admin/FUNCTIONS.tmpl
@@ -1,4 +1,4 @@
-<include "EDITFUNCTIONS.template">
+<include "EDITFUNCTIONS.tmpl">
 
 <function showAbsoluteLinkButton(anUrl, aLabel)>
     <span class="link-box-div">
@@ -15,7 +15,7 @@
 <assign LIST_ROW_CLASS             "listrow1">
 <assign LIST_ROW_CLASS_ALTERNATIVE "listrow2">
 
-<function EntityTable(anEntityList, aDataKeys, aHeaders, aFrom, aTo, aCount, aDeleteUri, aEditUri, aModuleName)>
+<function EntityTable(anEntityList, aDataKeys, aHeaders, aFrom, aTo, aCount, aDeleteUri, aEditUri, aDeleteCancelUri)>
   <assign nrColumns="0">
   <list aHeaders as h>
     <assign nrColumns=utility.increment(nrColumns)>
@@ -31,7 +31,7 @@
           <b>${i}</b> 
         </td>
       </list>
-      <if aShowDelete || aShowEdit>
+      <if aDeleteUri || aEditUri>
         <td class="${TABLE_HEAD_CLASS}">
           &nbsp;
         </td> 
@@ -56,13 +56,13 @@
         <if aDeleteUri || aEditUri>
           <td>
             <if aDeleteUri>
-            <a class="listcommand" href="${config.docRoot}/admin/${aDeleteUri}?id=${entry.id}">${lang("delete")}</a>
+            <a class="listcommand" href="${config.docRoot}/admin/${aDeleteUri}?id=${entry.id}&offset=${aFrom}&okurl=${aDeleteUri}&cancelurl=${aDeleteCancelUri}&order=&where">${lang("delete")}</a>
             </if>
-            <if aShowDelete && aShowEdit>
+            <if aDeleteUri && aEditUri>
             | 
             </if>
             <if aEditUri>
-              <a class="listcommand" href="${config.docRoot}/admin/${aEditUri}&id=${entry.id}">${lang("edit")}</a>
+              <a class="listcommand" href="${config.docRoot}/admin/${aEditUri}?id=${entry.id}&offset=${aFrom}">${lang("edit")}</a>
             </if>
           </td>
         </if>

diff --git a/templates/admin/confirm.tmpl b/templates/admin/confirm.tmpl
new file mode 100755 (executable)
index 0000000..1479f84
--- /dev/null
+++ b/templates/admin/confirm.tmpl
@@ -0,0 +1,30 @@
+<html>
+  <head>
+        <title>${config["Mir.Name"]} | ${lang("confirm.htmltitle")}</title>
+        <link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
+  </head>
+
+  <body marginwidth="0" marginheight="0" topmargin="0" leftmargin="0">
+    <center>
+      <include "head.tmpl">
+        <form method="post" action="${config.docRoot}/admin/confirm.do">
+          <table><tr><td>
+            <p class="box-head" align="center"><b>${lang("confirm.really_delete")}</b></p>
+            <p class="box" align="center">
+             <input type="hidden" name="id" value="${request.id}">
+             <input type="hidden" name="order" value="${request.order}">
+             <input type="hidden" name="limit" value="${request.limit}">
+             <input type="hidden" name="offset" value="${request.offset}">
+             <input type="hidden" name="okurl" value="${request.okurl}">
+             <input type="hidden" name="cancelurl" value="${request.cancelurl}">
+             <input type="submit" name="cancel" value="${lang("cancel")}">
+             <input type="submit" name="confirm" value="${lang("delete")}"><br>
+             <br>
+            <b><span class="text-alert">${lang("confirm.text")}</span></b>
+        </p>
+      </td></tr></table>
+       </form>
+      </center>
+    <include "foot.template">
+  </body>
+</html>

diff --git a/templates/admin/index.tmpl b/templates/admin/index.tmpl
index 716b375..9c4024f 100755 (executable)
--- a/templates/admin/index.tmpl
+++ b/templates/admin/index.tmpl
@@ -133,8 +133,8 @@
     <p class="box-head"><b>${lang("start.messageboard.title")}</b></p>
     <div class="box-bg">
       <span class="small">
-        <a href="${config.docRoot}/admin/messageAdd.do">[ + ${lang("add")}]</a> 
-        <a href="${config.docRoot}/admin/messageList.do">[${lang("edit")}]</a>
+        <a href="${config.docRoot}/admin/messageAdd.do?returnurl=index.do">[ + ${lang("add")}]</a> 
+        <a href="${config.docRoot}/admin/messageList.do?returnurl=index.do">[${lang("edit")}]</a>
       </span>
       <if request.messages>
         <list request.messages as m>

diff --git a/templates/admin/message.tmpl b/templates/admin/message.tmpl
new file mode 100755 (executable)
index 0000000..1718ceb
--- /dev/null
+++ b/templates/admin/message.tmpl
@@ -0,0 +1,45 @@
+<html>
+  <head>
+    <title>${config["Mir.Name"]} | ${lang("message.htmltitle")}</title>
+    <link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
+  <head>
+
+  <body marginwidth="0" marginheight="0" topmargin="0" leftmargin="0">
+    <include "FUNCTIONS.tmpl">
+    <include "head.tmpl">
+  
+      <if request.new && request.new=="1">
+        <assign action="messageSave.do">
+        <assign new=request.new>
+      <else>
+        <assign action="messageSave.do">
+        <assign new="0">
+      </if>
+      
+      
+      <call EditStart(action,["id", "offset", "new"], [request.id, request.offset, request.new])>
+         
+        <call EditReadonlyTextNormal(lang("message.id"), request.message.id)>
+        <call EditReadonlyTextNormal(lang("message.date"), request.message.webdbCreate.format(config["Mir.DefaultDateTimeFormat"]))>
+        <call EditTextNormal(lang("message.title"), 30, 30, "title", request.message.title)>
+        <call EditTextNormal(lang("message.creator"), 30, 30, "creator", request.message.creator)>
+
+        <call EditTextAreaNormal(lang("message.text"), "", "50", "5", "description", request.message.description)>
+      
+        <if request.new=="1">
+          <call EditSubmitButtonNormal(lang("insert"), "save")>
+        <else>
+          <call EditSubmitButtonNormal(lang("save"), "save")>
+        </if> 
+
+      <call EditEnd()>
+      
+      <if returnurl>
+        <call showBack(returnurl)>
+      <else>
+        <call showBack("module="+module+"&amp;do=list")>
+      </if>
+
+    <include "foot.template">
+  </body>
+</html>

diff --git a/templates/admin/messagelist.tmpl b/templates/admin/messagelist.tmpl
index 4294784..88e59d9 100755 (executable)
--- a/templates/admin/messagelist.tmpl
+++ b/templates/admin/messagelist.tmpl
@@ -9,7 +9,7 @@
     <include "FUNCTIONS.tmpl">
     <include "head.tmpl">
     
-    <call showAddOrBack("1", "messageAdd.shtml", "index.do", "")>
+    <call showAddOrBack("1", "messageAdd.do", "index.do", "")>
 
     <if request.messages>
       <assign baselisturl = "/admin/messageList.do?offset=">
@@ -17,9 +17,9 @@
       <call EntityTable(request.messages, [
            "id", "title", "creator", "description"], 
            [ lang("message.id"), lang("message.title"), lang("message.creator"), lang("message.text")], 
-          request.offset, request.nextoffset, "", "messageDelete.do", "messageEdit.do", "messagesEdit.do")>
+          request.offset, request.nextoffset, "", "messageDelete.do", "messageEdit.do", "messageList.do")>
       <call showPrevNextLinks(baselisturl+request.lastoffset, baselisturl+request.nextoffset, "left")>
-      <call showAddOrBack("1", "messageAdd.shtml", "index.do", "")>
+      <call showAddOrBack("1", "messageAdd.do", "index.do", "")>
     <else>
       <P align="center">${lang("no_matches_found")}</p>
     </if>