- Timestamp:
- 2013-09-10T10:39:37+12:00 (11 years ago)
- Location:
- main/trunk/model-sites-dev/pei-jones
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/model-sites-dev/pei-jones/collect/photos/etc/collectionConfig.xml
r28150 r28246 309 309 </xsl:text> 310 310 <xsl:choose> 311 <xsl:when test="/page/pageRequest/userInformation/@username ">311 <xsl:when test="/page/pageRequest/userInformation/@username and /page/pageRequest/userInformation/@editEnabled = 'true'"> 312 312 <xsl:text disable-output-escaping="yes">editable: true,</xsl:text> 313 313 </xsl:when> -
main/trunk/model-sites-dev/pei-jones/collect/photos/script/image-annotator/js/jquery.annotate2.js
r28055 r28246 175 175 **/ 176 176 $.fn.annotateImage.add = function(image) { 177 178 177 console.log("image mode = " + image.mode); 179 178 if (image.mode == 'view') { 180 179 image.mode = 'edit'; 180 181 gs.userInformation.currentAction = "editingNote"; 181 182 182 183 // Create/prepare the editable note elements … … 196 197 197 198 ok.click(function() { 198 199 gs.userInformation.currentAction = "savingNote"; 199 200 var form = $('#image-annotate-edit-form form'); 200 201 var text = $('#image-annotate-text').val(); -
main/trunk/model-sites-dev/pei-jones/transform/layouts/header.xsl
r28208 r28246 63 63 $(window).load(function() 64 64 { 65 if(gs.cgiParams.d != undefined && gs.userInformation != undefined)65 if(gs.cgiParams.d && gs.userInformation && gs.userInformation.editEnabled == "true") 66 66 { 67 67 var statusBarDiv = $("<div>"); … … 70 70 var statusUsernameMap = new Array(); 71 71 72 var recordURL = gs.xsltParams.library_name + "?a=g&rt=ro&s=RecordUserAction&s1.site=" + gs.xsltParams.site_name + "&s1.collection=" + gs.cgiParams.c + "&s1.oid=" + gs.cgiParams.d + "&s1.username=" + gs.userInformation.username + "&s1.action=viewingPage"; 73 var recordActionFunction = function(url) 72 var recordActionFunction = function() 74 73 { 75 $.ajax(url); 74 var action = gs.userInformation.currentAction; 75 if(!action) 76 { 77 action = "viewingPage"; 78 } 79 $.ajax(gs.xsltParams.library_name + "?a=g&rt=ro&s=RecordUserAction&s1.site=" + gs.xsltParams.site_name + "&s1.collection=" + gs.cgiParams.c + "&s1.oid=" + gs.cgiParams.d + "&s1.username=" + gs.userInformation.username + "&s1.action=" + action); 80 81 if(action == "savingNote" && gs.userInformation.saveSentOnce) 82 { 83 gs.userInformation.currentAction = "viewingPage"; 84 gs.userInformation.saveSentOnce = false; 85 } 86 else if(action == "savingNote") 87 { 88 gs.userInformation.saveSentOnce = true; 89 } 76 90 } 77 setInterval( function(){recordActionFunction(recordURL);}, 5000);78 recordActionFunction( recordURL);91 setInterval(recordActionFunction, 5000); 92 recordActionFunction(); 79 93 80 94 var userTrackerFunction = function(url) … … 93 107 } 94 108 109 var statusString; 95 110 if($(this).attr("action") == "viewingPage") 96 111 { 97 var statusID = statusBar.addStatus("User " + $(this).attr("username") + " is currently viewing this page");112 statusString = "User " + $(this).attr("username") + " is currently viewing this page"; 98 113 } 99 statusUsernameMap[username] = statusID; 114 else if($(this).attr("action") == "addingNote") 115 { 116 statusString = "User " + $(this).attr("username") + " is currently adding a note"; 117 } 118 else if($(this).attr("action") == "editingNote") 119 { 120 statusString = "User " + $(this).attr("username") + " is currently editing a note"; 121 } 122 else if($(this).attr("action") == "savingNote") 123 { 124 gs.userInformation.reloadRequired = true; 125 statusString = "User " + $(this).attr("username") + " has saved a note"; 126 } 127 128 if(gs.userInformation.reloadRequired) 129 { 130 statusString += ", a note has been added or changed, please click <a href=\"javascript:location.reload();\">here</a> to reload the page"; 131 } 132 statusBar.addStatus(statusString); 100 133 }); 101 134 }); -
main/trunk/model-sites-dev/pei-jones/transform/pages/document.xsl
r28203 r28246 149 149 <script type="text/javascript" src="interfaces/{$interface_name}/js/direct-edit.js"><xsl:text> </xsl:text></script> 150 150 <xsl:call-template name="init-direct-edit"/> 151 <xsl:if test="metadataList/metadata[@name='dc.Title'] or metadataList/metadata[@name='dc.Subject'] or /page/pageRequest/userInformation">151 <xsl:if test="metadataList/metadata[@name='dc.Title'] or metadataList/metadata[@name='dc.Subject'] or (/page/pageRequest/userInformation and /page/pageRequest/userInformation/@editEnabled = 'true')"> 152 152 <table id="meta{@nodeID}" style="width:100%;"> 153 <xsl:if test="metadataList/metadata[@name='dc.Title'] or /page/pageRequest/userInformation">153 <xsl:if test="metadataList/metadata[@name='dc.Title'] or (/page/pageRequest/userInformation and /page/pageRequest/userInformation/@editEnabled = 'true')"> 154 154 <tr> 155 155 <xsl:choose> 156 <xsl:when test=" /page/pageRequest/userInformation">156 <xsl:when test="(/page/pageRequest/userInformation and /page/pageRequest/userInformation/@editEnabled = 'true')"> 157 157 <td style="width:25%;" class="metaTableCellName">dc.Title</td> 158 158 </xsl:when> … … 173 173 </tr> 174 174 </xsl:if> 175 <xsl:if test="metadataList/metadata[@name='dc.Subject'] or /page/pageRequest/userInformation">175 <xsl:if test="metadataList/metadata[@name='dc.Subject'] or (/page/pageRequest/userInformation and /page/pageRequest/userInformation/@editEnabled = 'true')"> 176 176 <tr> 177 177 <xsl:choose> 178 <xsl:when test=" /page/pageRequest/userInformation">178 <xsl:when test="(/page/pageRequest/userInformation and /page/pageRequest/userInformation/@editEnabled = 'true')"> 179 179 <td style="width:25%;" class="metaTableCellName">dc.Subject</td> 180 180 </xsl:when> … … 197 197 </table> 198 198 </xsl:if> 199 <xsl:if test="/page/pageRequest/userInformation ">199 <xsl:if test="/page/pageRequest/userInformation and /page/pageRequest/userInformation/@editEnabled = 'true'"> 200 200 <button id="quickSaveButton">Save Changes</button> 201 201 <script type="text/javascript">
Note:
See TracChangeset
for help on using the changeset viewer.