Changeset 27258 for main/trunk/greenstone2/macros/document.dm

Timestamp:

2013-04-25T14:54:29+12:00 (11 years ago)

Author:

ak19

Message:

1. The Add User Comment form is no longer displayed when Browsing, only on document pages. 2. When a user is in a subsection and tries to add a comment, it should get added to the top section, which is at the docid level, and not get added at the subsection level. This also means that import's metadata will be set correctly in metadata.xml, since import doesn't store subsection level meta.

File:

• main/trunk/greenstone2/macros/document.dm (modified) (4 diffs)

main/trunk/greenstone2/macros/document.dm

@@ -125 +125 @@
 #######################################################################
 
-# For 
+# Display the add-user-comment form on actual document pages and not when browsing/searching
+# This means the form should only be displayed on pages where the _cgiargd_ (the docid) is set
+
+# For getting the submitbutton to make Ajax calls, see
 # http://stackoverflow.com/questions/4264091/input-type-submit-instead-of-input-type-button-with-ajax
 # http://stackoverflow.com/questions/8869341/ajax-form-submit-with-submit-button
 
 _usercomment_ {
+
+_If_(_cgiargd_,
 
 <form name="AddUserCommentForm">
@@ -141 +146 @@
 <input type="submit" value="_textaddcomment_" onclick="addUserComment(document.AddUserCommentForm.username.value, document.AddUserCommentForm.comment.value, document.AddUserCommentForm.d.value); return false;">
 </form>
-
+)
 <script type="text/javascript">  
     function addUserComment(_username, _comment, _docid) \{
+        // Need to the add user comment meta of username, timestamp and comment to the
+        // topmost section of the document. So only get the docId up to any period mark:
+        var period = _docid.indexOf(".");
+        if(period != -1) \{
+            _docid = _docid.substring(0, period);
+        \}
 
         // Want to store username, timestamp and comment in import/metadata.xml, archives/doc.xml
@@ -183 +194 @@
 
         var comment_rec = \{
-            metaname: "comment",
+            metaname: "usercomment",
             metavals: [_comment]
         \};
@@ -203 +214 @@
 </script>
 }
+
 
 #######################################################################