Changeset 28246 for main/trunk/model-sites-dev/pei-jones/collect

Timestamp:

2013-09-10T10:39:37+12:00 (11 years ago)

Author:

sjm84

Message:

Some more features added to the usertracker and hooking up the page to the editenabled variable

Location:

main/trunk/model-sites-dev/pei-jones/collect/photos

Files:

• etc/collectionConfig.xml (modified) (1 diff)
• script/image-annotator/js/jquery.annotate2.js (modified) (2 diffs)

main/trunk/model-sites-dev/pei-jones/collect/photos/etc/collectionConfig.xml

@@ -309 +309 @@
                                     </xsl:text>
                                         <xsl:choose>
-                                            <xsl:when test="/page/pageRequest/userInformation/@username">
+                                            <xsl:when test="/page/pageRequest/userInformation/@username and /page/pageRequest/userInformation/@editEnabled = 'true'">
                                                 <xsl:text disable-output-escaping="yes">editable: true,</xsl:text>
                                             </xsl:when>

main/trunk/model-sites-dev/pei-jones/collect/photos/script/image-annotator/js/jquery.annotate2.js

@@ -175 +175 @@
     **/
     $.fn.annotateImage.add = function(image) {
-        
         console.log("image mode = " + image.mode);
         if (image.mode == 'view') {
             image.mode = 'edit';
+            
+            gs.userInformation.currentAction = "editingNote";
 
             // Create/prepare the editable note elements
@@ -196 +197 @@
 
         ok.click(function() {
-                        
+            gs.userInformation.currentAction = "savingNote";
             var form = $('#image-annotate-edit-form form');
             var text = $('#image-annotate-text').val();