Second fix for BT#7413

main/admin/add_sessions_to_usergroup.php

@@ -1,8 +1,8 @@
 <?php
 /* For licensing terms, see /license.txt */
 /**
- *   @package chamilo.admin
- */
+*   @package chamilo.admin
+*/
 
 // name of the language file that needs to be included
 $language_file=array('admin','registration');
@@ -69,6 +69,16 @@ function remove_item(origin) {
     }
 }
 
+function display_advanced_search () {
+        if ($("#advancedSearch").css("display") == "none") {
+                $("#advancedSearch").css("display","block");
+                $("#img_plus_and_minus").html(\'&nbsp;'.Display::return_icon('div_hide.gif',get_lang('Hide'),array('style'=>'vertical-align:middle')).'&nbsp;'.get_lang('AdvancedSearch').'\');
+        } else {
+                $("#advancedSearch").css("display","none");
+                $("#img_plus_and_minus").html(\'&nbsp;'.Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).'&nbsp;'.get_lang('AdvancedSearch').'\');
+        }
+}
+
 function validate_filter() {
         document.formulaire.add_type.value = \''.$add_type.'\';
         document.formulaire.form_sent.value=0;
@@ -182,14 +192,15 @@ if ($add_type == 'multiple') {
 
 echo '<div class="actions">';
 echo '<a href="usergroups.php">'.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).'</a>'; 
+echo '<a href="javascript://" class="advanced_parameters" style="margin-top: 8px" onclick="display_advanced_search();"><span id="img_plus_and_minus">&nbsp;'.Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).' '.get_lang('AdvancedSearch').'</span></a>';
 echo '</div>';
 
 ?>
-    <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
-        <?php
-        echo '<legend>'.$data['name'].': '.$tool_name.'</legend>';
+<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
+<?php
+echo '<legend>'.$data['name'].': '.$tool_name.'</legend>';
 
-        if ($add_type=='multiple') {
+if ($add_type=='multiple') {
     if (is_array($extra_field_list)) {
         if (is_array($new_field_list) && count($new_field_list)>0 ) {
             echo '<h3>'.get_lang('FilterUsers').'</h3>';
@@ -214,41 +225,42 @@ echo '</div>';
             echo '<br /><br />';
         }
     }
-        }
-        echo Display::input('hidden','id',$id);
-        echo Display::input('hidden','form_sent','1');
-        echo Display::input('hidden','add_type',null);
-        if(!empty($errorMsg)) {
+}
+echo Display::input('hidden','id',$id);
+echo Display::input('hidden','form_sent','1');
+echo Display::input('hidden','add_type',null);
+if(!empty($errorMsg)) {
     Display::display_normal_message($errorMsg); //main API
-        }
-        ?>
+}
+?>
 
-        <table border="0" cellpadding="5" cellspacing="0" width="100%">
-            <tr>
+<table border="0" cellpadding="5" cellspacing="0" width="100%">
+<tr>
   <td align="center"><b><?php echo get_lang('SessionsInPlatform') ?> :</b>
   </td>
   <td></td>
   <td align="center"><b><?php echo get_lang('SessionsInGroup') ?> :</b></td>
-            </tr>
+</tr>
 
-            <?php if ($add_type=='multiple') { ?>
-                <tr>
-                    <td align="center">
-                        <?php echo get_lang('FirstLetterSessions'); ?> :
+<?php if ($add_type=='multiple') { ?>
+<tr>
+<td align="center">
+<?php echo get_lang('FirstLetterSessions'); ?> :
      <select name="firstLetterUser" onchange = "xajax_search_sessions(this.value,'multiple')" >
       <option value = "%">--</option>
       <?php
         echo Display :: get_alphabet_options();
       ?>
      </select>
-                        <?php echo '<br />'; ?>
-                        <?php echo get_lang('SearchSessions'); ?> :
-                        <input name="SearchUser" class="span3" onchange = "xajax_search_sessions(this.value,'searchbox')" onkeyup="this.onchange()">
-                    </td>
-                    <td align="center">&nbsp;</td>
-                </tr>
-            <?php } ?>
-            <tr>
+<?php echo '<br />'; ?>
+<?php echo '<div id="advancedSearch" style="display: none">'. get_lang('SearchSessions'); ?> :
+     <input name="SearchSession" onchange = "xajax_search_sessions(this.value,'searchbox')" onkeyup="this.onchange()">
+     </div>
+</td>
+<td align="center">&nbsp;</td>
+</tr>
+<?php } ?>
+<tr>
   <td align="center">
   <div id="content_source">
       <?php           
@@ -284,26 +296,26 @@ echo '</div>';
     <br /><br /><br /><br /><br /><br />
   </td>
   <td align="center">
-                    <?php
+<?php
     echo Display::select('elements_in_name[]', $elements_in, '', array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'elements_in','size'=>'15px'),false );
     unset($sessionUsersList);
-                    ?>
+?>
  </td>
-            </tr>
-            <tr>
+</tr>
+<tr>
     <td colspan="3" align="center">
         <br />
         <?php
         echo '<button class="save" type="button" value="" onclick="valide()" >'.get_lang('SubscribeClassToSessions').'</button>';
         ?>
     </td>
-            </tr>
-        </table>
-    </form>
+</tr>
+</table>
+</form>
 
-    <script type="text/javascript">
-        <!--
-        function moveItem(origin , destination){
+<script type="text/javascript">
+<!--
+function moveItem(origin , destination){
 
     for(var i = 0 ; i<origin.options.length ; i++) {
         if(origin.options[i].selected) {
@@ -315,9 +327,9 @@ echo '</div>';
     destination.selectedIndex = -1;
     sortOptions(destination.options);
 
-        }
+}
 
-        function sortOptions(options) {
+function sortOptions(options) {
 
     newOptions = new Array();
     for (i = 0 ; i<options.length ; i++)
@@ -328,9 +340,9 @@ echo '</div>';
     for(i = 0 ; i < newOptions.length ; i++)
         options[i] = newOptions[i];
 
-        }
+}
 
-        function mysort(a, b){
+function mysort(a, b){
     if(a.text.toLowerCase() > b.text.toLowerCase()){
         return 1;
     }
@@ -338,17 +350,17 @@ echo '</div>';
         return -1;
     }
     return 0;
-        }
+}
 
-        function valide(){
+function valide(){
     var options = document.getElementById('elements_in').options;
     for (i = 0 ; i<options.length ; i++)
         options[i].selected = true;
     document.forms.formulaire.submit();
-        }
+}
 
 
-        function loadUsersInSelect(select){
+function loadUsersInSelect(select){
 
     var xhr_object = null;
 
@@ -377,17 +389,17 @@ echo '</div>';
             //alert(xhr_object.responseText);
         }
     }
-        }
+}
 
-        function makepost(select){
+function makepost(select){
     var options = select.options;
     var ret = "";
     for (i = 0 ; i<options.length ; i++)
         ret = ret + options[i].value +'::'+options[i].text+";;";
 
     return ret;
-        }
-        -->
-    </script>
+}
+-->
+</script>
 <?php
 Display::display_footer();

main/lang/english/admin.inc.php

@@ -1688,4 +1688,5 @@ $SpaceUsedOnSystemCannotBeMeasuredOnWindows = "The space used on disk cannot be
 $XOldTablesDeleted = "%d old tables deleted";
 $XOldDatabasesDeleted = "%d old databases deleted";
 $ExtensionShouldBeLoaded = "This extension should be loaded.";
+$SearchSessions = "Session search";
 ?>

main/lang/spanish/admin.inc.php

@@ -1715,4 +1715,5 @@ $SpaceUsedOnSystemCannotBeMeasuredOnWindows = "El espacio usado en el disco no p
 $XOldTablesDeleted = "%d tablas antiguas eliminadas";
 $XOldDatabasesDeleted = "%d bases de datos antiguas eliminadas";
 $ExtensionShouldBeLoaded = "Esta extensión debería ser cargada.";
+$SearchSessions = "Búsqueda de sesiones";
 ?>