Merge pull request #1 from glpi-project/master

merge of latest modif
glpi-project · Sep 22, 2015 · 76dc8ab · 76dc8ab
2 parents fcdd36b + 006212a
commit 76dc8ab
Show file tree

Hide file tree

Showing 288 changed files with 88,240 additions and 79,915 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,5 @@ files/
 .buildpath
 .project
 .settings/
+tools/composer.lock
+tools/vendor/
diff --git a/.tx/config b/.tx/config
@@ -0,0 +1,8 @@
+[main]
+host = https://www.transifex.com
+
+[GLPI.glpipot090]
+file_filter = locales/<lang>.po
+source_file = locales/glpi.pot
+source_lang = en_GB
+
diff --git a/ajax/dropdownAllItems.php b/ajax/dropdownAllItems.php
@@ -71,7 +71,7 @@
    if (isset($_POST['condition'])) {
       $p['condition'] = $_POST['condition'];
    }
-   if (isset($_POST['used'])) {
+   if (isset($_POST['used'][$_POST['idtable']])) {
       $p['used'] = $_POST['used'][$_POST['idtable']];
    }
 

diff --git a/ajax/searchoption.php b/ajax/searchoption.php
@@ -87,8 +87,7 @@
       }
       $randsearch = Dropdown::showFromArray($fieldname."[".$_POST["num"]."][searchtype]",
                                             $actions,
-                                            array('value'  => $_POST["searchtype"],
-                                                  'width'  => '100%'));
+                                            array('value'  => $_POST["searchtype"]));
       $fieldsearch_id = Html::cleanId("dropdown_".$fieldname."[".$_POST["num"]."][searchtype]$randsearch");
    }
    echo "</td><td width='80%'>";

diff --git a/ajax/searchrow.php b/ajax/searchrow.php
@@ -128,8 +128,7 @@
       }
       Dropdown::showFromArray("criteria[".$_POST["num"]."][link]",
                               Search::getLogicalOperators(),
-                              array('value' => $value,
-                                    'width' => '30%'));
+                              array('value' => $value));
    }
 
    $selected = $first = '';
@@ -165,8 +164,7 @@
    } 
 
    $rand     = Dropdown::showFromArray("criteria[".$_POST["num"]."][field]", $values,
-                                       array('value' => $value,
-                                             'width' => '60%'));
+                                       array('value' => $value));
    $field_id = Html::cleanId("dropdown_criteria[".$_POST["num"]."][field]$rand");
    echo "</td><td class='left'>";
    $spanid= 'SearchSpan'.$_POST["itemtype"].$_POST["num"];

diff --git a/ajax/updateMetaSearch.php b/ajax/updateMetaSearch.php
@@ -64,8 +64,7 @@
    }
 }
 $rand     = Dropdown::showFromArray("metacriteria[".$_POST["num"]."][field]", $values,
-                                    array('value' => $_POST["field"],
-                                          'width' => '100%'));
+                                    array('value' => $_POST["field"]));
 $field_id = Html::cleanId("dropdown_metacriteria[".$_POST["num"]."][field]".$rand);
 
 echo "</td><td class='left'>";

diff --git a/css/palettes/teclib.css b/css/palettes/teclib.css
@@ -46,7 +46,7 @@ a, a:link {
 }
 
 #c_menu {
-   background-color: #F3F3F4;
+   background-color: #C6C6C8;
 }
 
 ul#menu a.itemP, ul#menu a.itemP1 {