Fixed issue #6986: Usability tokens

application/controllers/admin/tokens.php

@@ -279,7 +279,6 @@ function browse($iSurveyId, $limit = 50, $start = 0, $order = false, $searchstri
         }
         // Javascript
         $this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . "tokens.js");
-        $this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . "tokentocpdb.js");
         $this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . "jquery/jquery.multiselect.min.js");
         $this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . "jquery/jqGrid/js/i18n/grid.locale-en.js");
         $this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . "jquery/jqGrid/js/jquery.jqGrid.min.js");

application/views/admin/token/browse.php

@@ -33,6 +33,7 @@
     // Build the javasript variables to pass to the jqGrid
 ?>
 <script type="text/javascript">
+    var sAddParticipantToCPDBText = '<?php $clang->eT("Add participants to central database",'js');?>';
     var sRecordText = '<?php $clang->eT("View {0} - {1} of {2}",'js');?>';
     var sPageText = '<?php $clang->eT("Page {0} of {1}",'js');?>';
     var imageurl = "<?php echo Yii::app()->getConfig('adminimageurl'); ?>";
@@ -52,7 +53,7 @@
     var minusbutton = "<?php echo Yii::app()->getConfig('adminimageurl') . "deleteanswer.png" ?>";
     var survey_id = "<?php echo $surveyid; ?>";
     var delUrl = "<?php echo Yii::app()->getController()->createUrl("admin/tokens/sa/delete/surveyid/{$surveyid}"); ?>";
-    var cancelBtn = "<?php $clang->eT("Cancel") ?>";
+    var saveBtn = "<?php $clang->eT("Save changes") ?>";
     var okBtn = "<?php echo $clang->eT("OK") ?>";
     var delmsg = "<?php $clang->eT("Are you sure you want to delete the selected entries?") ?>";
     var surveyID = "<?php echo $surveyid; ?>";
@@ -166,7 +167,6 @@ function sendPost(myaction,checkcode,arrayparam,arrayval)
 <table id="displaytokens"></table> <div id="pager"></div>
 
 <?php if (hasGlobalPermission('USER_RIGHT_PARTICIPANT_PANEL')) { ?>
-    <p><input type='button' name='addtocpdb' id='addtocpdb' value='<?php $clang->eT("Add participants to central database");?>'/><br /></p>
     <div id="addcpdb" title="addsurvey" style="display:none">
         <p><?php $clang->eT("Please select the attributes that are to be added to the central database"); ?></p>
         <p>

scripts/admin/tokens.js

@@ -27,6 +27,40 @@ function addcondition()
 }
 
 
+function addSelectedParticipantsToCPDB()
+{
+    var dialog_buttons={};
+    var token = [];
+
+    var token = jQuery('#displaytokens').jqGrid('getGridParam','selarrrow');
+
+    if(token.length==0)
+    {        /* build an array containing the various button functions */
+        /* Needed because it's the only way to label a button with a variable */
+
+        dialog_buttons[okBtn]=function(){
+            $( this ).dialog( "close" );
+        };
+        /* End of building array for button functions */
+        $('#norowselected').dialog({
+            modal: true,
+            buttons: dialog_buttons
+        });
+    }
+    else
+    {
+        $("#addcpdb").load(postUrl, {
+            participantid:token},function(){
+                $(location).attr('href',attMapUrl+'/'+survey_id);
+        });        
+    }    
+
+    /*$(":checked").each(function() {
+    token.push($(this).attr('name'));
+    });*/
+}
+
+
 $(document).ready(function() {
 
     $("#filterduplicatetoken").change(function(){
@@ -118,6 +152,7 @@ $(document).ready(function() {
         loadComplete: function()
         {
             /* Sneaky way of adding custom icons to jqGrid pager buttons */
+            $("#pager").find(".ui-add-to-cpdb-link").css({"background-image":"url("+imageurl+"addtocpdb_12.png)", "background-position":"0", "color":"black"});
             $("#pager").find(".ui-participant-link").css({"background-image":"url("+imageurl+"cpdb_12.png)", "background-position":"0", "color":"black"});
             $("#pager").find(".ui-bounceprocessing").css({"background-image":"url("+imageurl+"bounce_12.png)", "background-position":"0", "color":"black"});
             window.editing = false;
@@ -150,10 +185,10 @@ $(document).ready(function() {
                     dateFormat: userdateformat
                 });
 
-                jQuery('<input type="image" class="drop_editing" src="' + jQuery(this).parent().find('a.imagelink.btnDelete img').attr('src') + '" />')
+                jQuery('<input type="image" class="drop_editing" title="'+cancelBtn+'" src="' + imageurl + 'token_delete.png" />')
                 .appendTo(jQuery(this).parent())
                 .click(func);
-                jQuery('<input type="image" class="save" src="' + imageurl + '/ok.png" width="16" />')
+                jQuery('<input type="image" class="save" title="'+saveBtn+'" src="' + imageurl + 'ok.png" width="16" />')
                 .appendTo(jQuery(this).parent())
                 .click(function()
                 {
@@ -309,17 +344,6 @@ $(document).ready(function() {
             window.open(remindurl+$("#displaytokens").getGridParam("selarrrow").join("|"), "_blank")
         }
     });                 
-    if (bParticipantPanelPermission==true)
-    {
-        $("#displaytokens").navButtonAdd('#pager', {
-            caption:"",
-            title:viewParticipantsLink,
-            buttonicon:'ui-participant-link',
-            onClickButton:function(){
-                window.open(participantlinkUrl, "_top");
-            }
-        });
-    }
     $("#displaytokens").navButtonAdd('#pager', {
         caption:"",
         title:sBounceProcessing,
@@ -337,6 +361,25 @@ $(document).ready(function() {
             checkbounces();
         }
     });
+    if (bParticipantPanelPermission==true)
+    {
+        $("#displaytokens").navSeparatorAdd("#pager",{});        
+        $("#displaytokens").navButtonAdd('#pager', {
+            caption:"",
+            title:viewParticipantsLink,
+            buttonicon:'ui-participant-link',
+            onClickButton:function(){
+                window.open(participantlinkUrl, "_top");
+            }
+        });
+        $("#displaytokens").navButtonAdd('#pager', {
+            caption:"",
+            title:sAddParticipantToCPDBText,
+            buttonicon:'ui-add-to-cpdb-link',
+            onClickButton:addSelectedParticipantsToCPDB
+        });
+    }
+
     $.extend(jQuery.jgrid.edit,{
         closeAfterAdd: true,
         reloadAfterSubmit: true,