Commit d9340acb authored by Anael Mobilia's avatar Anael Mobilia Committed by Johan Cwiklinski

Expand PHPCS usage (#1635)

* More important coverage for PHPCS + use negation for PHPCS checks (default = all files)
Fix made with phpcbf
* Remove wilcards, ignore configs
parent 7ae542bf
......@@ -13,7 +13,7 @@ before_script:
script:
- mysql -u root -e 'select version();'
- phpunit --verbose
- vendor/bin/phpcs -p --standard=vendor/glpi-project/coding-standard/GlpiStandard/ apirest.php apixmlrpc.php index.php status.php inc/ front/ ajax/ tests/
- vendor/bin/phpcs -p --standard=vendor/glpi-project/coding-standard/GlpiStandard/ --ignore=/vendor/,/plugins/,/files/,/lib/,/config/,/tests/config ./
matrix:
include:
......
......@@ -8,7 +8,7 @@
based on GLPI - Gestionnaire Libre de Parc Informatique
Copyright (C) 2003-2014 by the INDEPNET Development Team.
-------------------------------------------------------------------------
LICENSE
......@@ -30,7 +30,7 @@
--------------------------------------------------------------------------
*/
.jstree-classic li,
.jstree-classic li,
.jstree-classic ins { background-image:url("d.png"); background-repeat:no-repeat; background-color:transparent; }
.jstree-classic li { background-position:-90px 0; background-repeat:repeat-y; }
.jstree-classic li.jstree-last { background:transparent; }
......@@ -46,7 +46,7 @@
.jstree-classic.jstree-focused { background:white; }
.jstree-classic .jstree-no-dots li,
.jstree-classic .jstree-no-dots li,
.jstree-classic .jstree-no-dots .jstree-leaf > ins { background:transparent; }
.jstree-classic .jstree-no-dots .jstree-open > ins { background-position:-18px 0; }
.jstree-classic .jstree-no-dots .jstree-closed > ins { background-position:0 0; }
......@@ -72,22 +72,22 @@
.jstree-classic a.jstree-search { color:#ffb94b; }
.jstree-classic .jstree-locked a { color:silver; cursor:default; }
#vakata-contextmenu.jstree-classic-context,
#vakata-contextmenu.jstree-classic-context,
#vakata-contextmenu.jstree-classic-context li ul { background:#f0f0f0; border:1px solid #979797; -moz-box-shadow: 1px 1px 2px #999; -webkit-box-shadow: 1px 1px 2px #999; box-shadow: 1px 1px 2px #999; }
#vakata-contextmenu.jstree-classic-context li { }
#vakata-contextmenu.jstree-classic-context a { color:black; }
#vakata-contextmenu.jstree-classic-context a:hover,
#vakata-contextmenu.jstree-classic-context a:hover,
#vakata-contextmenu.jstree-classic-context .vakata-hover > a { padding:0 5px; background:#e8eff7; border:1px solid #aecff7; color:black; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; }
#vakata-contextmenu.jstree-classic-context li.jstree-contextmenu-disabled a,
#vakata-contextmenu.jstree-classic-context li.jstree-contextmenu-disabled a,
#vakata-contextmenu.jstree-classic-context li.jstree-contextmenu-disabled a:hover { color:silver; background:transparent; border:0; padding:1px 4px; }
#vakata-contextmenu.jstree-classic-context li.vakata-separator { background:white; border-top:1px solid #e0e0e0; margin:0; }
#vakata-contextmenu.jstree-classic-context li ul { margin-left:-4px; }
/* IE6 BEGIN */
.jstree-classic li,
.jstree-classic li,
.jstree-classic ins,
#vakata-dragged.jstree-classic .jstree-invalid,
#vakata-dragged.jstree-classic .jstree-ok,
#vakata-dragged.jstree-classic .jstree-invalid,
#vakata-dragged.jstree-classic .jstree-ok,
#jstree-marker.jstree-classic { _background-image:url("d.gif"); }
.jstree-classic .jstree-open ins { _background-position:-72px 0; }
.jstree-classic .jstree-closed ins { _background-position:-54px 0; }
......
/* ===== LOGIN ===== */
#firstboxlogin {
......@@ -6,7 +5,7 @@
}
#logo_login {
background: url(../../pics/login_logo_glpi.png) center no-repeat, #459436;
background: url(../../pics/login_logo_glpi.png) center no-repeat, #459436;
}
#display-login {
......@@ -19,7 +18,7 @@
}
#boxlogin #forget,
#boxlogin #forget,
#footer-login a {
color: #459436;
}
......@@ -82,7 +81,7 @@ ul#menu ul li a {
}
/* ====== BUTTONS ====== */
a.vsubmit,
a.vsubmit,
.vsubmit a {
color: #c1e6ba;
}
......
/* ===== LOGIN ===== */
#firstboxlogin {
......@@ -6,7 +5,7 @@
}
#logo_login {
background: url(../../pics/login_logo_glpi.png) center no-repeat, #3A5693;
background: url(../../pics/login_logo_glpi.png) center no-repeat, #3A5693;
}
#display-login {
......@@ -72,7 +71,7 @@ ul#menu ul li a {
/* ====== BUTTONS ====== */
a.vsubmit,
a.vsubmit,
.vsubmit a {
color: #8f5a0a;
}
......
/* ===== LOGIN ===== */
#firstboxlogin {
......@@ -6,7 +5,7 @@
}
#logo_login {
background: url(../../pics/login_logo_glpi.png) center no-repeat, #113F59;
background: url(../../pics/login_logo_glpi.png) center no-repeat, #113F59;
}
#display-login {
......@@ -77,9 +76,9 @@ ul#menu ul li a {
/* ====== BUTTONS ====== */
input.submit,
input.submit,
span.vsubmit, a.vsubmit,
.ui-widget-content span.vsubmit, a.vsubmit,
.ui-widget-content span.vsubmit, a.vsubmit,
#BackToTop {
color: #F2B265;
background-color: #8B4D34;
......@@ -89,8 +88,8 @@ span.vsubmit, a.vsubmit,
text-decoration: underline;
}
input.submit:hover,
a.vsubmit:hover,
input.submit:hover,
a.vsubmit:hover,
#BackToTop:hover {
background-color: #8B4D34;
}
......
/* ===== LOGIN ===== */
#firstboxlogin {
......@@ -6,7 +5,7 @@
}
#logo_login {
background: url(../../pics/login_logo_glpi.png) center no-repeat, #E1D39E;
background: url(../../pics/login_logo_glpi.png) center no-repeat, #E1D39E;
}
#display-login {
......@@ -79,7 +78,7 @@ ul#menu ul li a {
}
/* ====== BUTTONS ====== */
a.vsubmit,
a.vsubmit,
.vsubmit a {
color: #8f5a0a;
}
\ No newline at end of file
/* ===== LOGIN ===== */
#firstboxlogin {
......@@ -6,7 +5,7 @@
}
#logo_login {
background: url(../../pics/login_logo_glpi.png) center no-repeat, #008B8D;
background: url(../../pics/login_logo_glpi.png) center no-repeat, #008B8D;
}
#display-login {
......@@ -66,7 +65,7 @@ ul#menu ul.ssmenu li.active > a {
color: #FFF;
}
ul#menu > li:hover,
ul#menu > li:hover,
ul#menu > li:hover > a {
background-color: #B2341C;
color: #fff;
......@@ -79,7 +78,7 @@ ul#menu ul li a:hover {
/* ====== BUTTONS ====== */
input.submit {
input.submit {
background-color: #FF5131;
color: #fff;
border: 1px solid #FF674A;
......
/* ===== LOGIN ===== */
#firstboxlogin {
......@@ -6,7 +5,7 @@
}
#logo_login {
background: url(../../pics/login_logo_glpi.png) center no-repeat, #161514;
background: url(../../pics/login_logo_glpi.png) center no-repeat, #161514;
}
#display-login {
......@@ -77,9 +76,9 @@ ul#menu ul li a {
/* ====== BUTTONS ====== */
input.submit,
input.submit,
span.vsubmit, a.vsubmit,
.ui-widget-content span.vsubmit, a.vsubmit,
.ui-widget-content span.vsubmit, a.vsubmit,
#BackToTop {
color: #fff;
background-color: #585957;
......@@ -89,8 +88,8 @@ span.vsubmit, a.vsubmit,
text-decoration: underline;
}
input.submit:hover,
a.vsubmit:hover,
input.submit:hover,
a.vsubmit:hover,
#BackToTop:hover {
background-color: #585957;
}
......
/* ===== LOGIN ===== */
#firstboxlogin {
......@@ -6,7 +5,7 @@
}
#logo_login {
background: url(../../pics/login_logo_glpi.png) center no-repeat, #008B8D;
background: url(../../pics/login_logo_glpi.png) center no-repeat, #008B8D;
}
#display-login {
......@@ -65,7 +64,7 @@ ul#menu ul.ssmenu li.active > a {
color: #FFF;
}
ul#menu > li:hover,
ul#menu > li:hover,
ul#menu > li:hover > a {
background-color: #81BEAA;
color: #000;
......@@ -78,9 +77,9 @@ ul#menu ul li a:hover {
/* ====== BUTTONS ====== */
input.submit,
input.submit,
span.vsubmit, a.vsubmit,
.ui-widget-content span.vsubmit, a.vsubmit,
.ui-widget-content span.vsubmit, a.vsubmit,
#BackToTop {
color: #816644;
background-color: #F4D4AD;
......@@ -90,8 +89,8 @@ span.vsubmit, a.vsubmit,
text-decoration: underline;
}
input.submit:hover,
a.vsubmit:hover,
input.submit:hover,
a.vsubmit:hover,
#BackToTop:hover {
background-color: #F4D4AD;
}
......
/* ===== LOGIN ===== */
#firstboxlogin {
......@@ -6,7 +5,7 @@
}
#logo_login {
background: url(../../pics/login_logo_glpi.png) center no-repeat, #09A071;
background: url(../../pics/login_logo_glpi.png) center no-repeat, #09A071;
}
#display-login {
......@@ -71,7 +70,7 @@ ul#menu ul li a {
/* ====== BUTTONS ====== */
a.vsubmit,
a.vsubmit,
.vsubmit a {
color: #8f5a0a;
}
\ No newline at end of file
/* ===== LOGIN ===== */
#firstboxlogin {
......@@ -6,7 +5,7 @@
}
#logo_login {
background: url(../../pics/login_logo_glpi.png) center no-repeat, #008B8D;
background: url(../../pics/login_logo_glpi.png) center no-repeat, #008B8D;
}
#display-login {
......@@ -65,7 +64,7 @@ ul#menu ul.ssmenu li.active > a {
color: #FFF;
}
ul#menu > li:hover,
ul#menu > li:hover,
ul#menu > li:hover > a {
background-color: #d6665a;
color: #fff;
......@@ -78,7 +77,7 @@ ul#menu ul li a:hover {
/* ====== BUTTONS ====== */
input.submit {
input.submit {
background-color: #d6665a;
color: #fff;
border: 1px solid #e08c83;
......
/* ===== LOGIN ===== */
#firstboxlogin {
......@@ -6,7 +5,7 @@
}
#logo_login {
background: url(../../pics/login_logo_glpi.png) center no-repeat, #113F59;
background: url(../../pics/login_logo_glpi.png) center no-repeat, #113F59;
}
#display-login {
......@@ -77,9 +76,9 @@ ul#menu ul li a {
/* ====== BUTTONS ====== */
input.submit,
input.submit,
span.vsubmit, a.vsubmit,
.ui-widget-content span.vsubmit, a.vsubmit,
.ui-widget-content span.vsubmit, a.vsubmit,
#BackToTop {
color: #F3EDD3;
background-color: #D54F58;
......@@ -89,8 +88,8 @@ span.vsubmit, a.vsubmit,
text-decoration: underline;
}
input.submit:hover,
a.vsubmit:hover,
input.submit:hover,
a.vsubmit:hover,
#BackToTop:hover {
background-color: #D54F58;
}
......
/* ===== LOGIN ===== */
#firstboxlogin {
......@@ -6,7 +5,7 @@
}
#logo_login {
background: url(../../pics/login_logo_glpi.png) center no-repeat, #5ABCFF;
background: url(../../pics/login_logo_glpi.png) center no-repeat, #5ABCFF;
}
#display-login {
......@@ -65,7 +64,7 @@ ul#menu ul.ssmenu li.active > a {
color: #FFF;
}
ul#menu > li:hover,
ul#menu > li:hover,
ul#menu > li:hover > a {
background-color: #41B1FF;
color: #fff;
......@@ -78,7 +77,7 @@ ul#menu ul li a:hover {
/* ====== BUTTONS ====== */
input.submit {
input.submit {
background-color: #41B1FF;
color: #fff;
border: 1px solid #88c9ff;
......
/* ===== LOGIN ===== */
#firstboxlogin {
......@@ -6,7 +5,7 @@
}
#logo_login {
background: url(../../pics/login_logo_glpi.png) center no-repeat, #A2291F;
background: url(../../pics/login_logo_glpi.png) center no-repeat, #A2291F;
}
#display-login {
......@@ -77,9 +76,9 @@ ul#menu ul li a {
/* ====== BUTTONS ====== */
input.submit,
input.submit,
span.vsubmit, a.vsubmit,
.ui-widget-content span.vsubmit, a.vsubmit,
.ui-widget-content span.vsubmit, a.vsubmit,
#BackToTop {
color: #FFF;
background-color: #FB6356;
......@@ -89,8 +88,8 @@ span.vsubmit, a.vsubmit,
text-decoration: underline;
}
input.submit:hover,
a.vsubmit:hover,
input.submit:hover,
a.vsubmit:hover,
#BackToTop:hover {
background-color: #FB6356;
}
......
......@@ -11,7 +11,7 @@ body {
}
#logo_login {
background: url(../../pics/login_logo_glpi.png) center no-repeat, #008B8D;
background: url(../../pics/login_logo_glpi.png) center no-repeat, #008B8D;
}
#display-login {
......@@ -70,7 +70,7 @@ ul#menu ul.ssmenu li.active > a {
color: #FFF;
}
ul#menu > li:hover,
ul#menu > li:hover,
ul#menu > li:hover > a {
background-color: #3c3874;
color: #fff;
......@@ -83,7 +83,7 @@ ul#menu ul li a:hover {
/* ====== BUTTONS ====== */
input.submit {
input.submit {
background-color: #5953ab;
color: #fff;
}
......
/* ===== LOGIN ===== */
#firstboxlogin {
......@@ -6,7 +5,7 @@
}
#logo_login {
background: url(../../pics/login_logo_glpi.png) center no-repeat, #8E21A1;
background: url(../../pics/login_logo_glpi.png) center no-repeat, #8E21A1;
}
#display-login {
......@@ -18,7 +17,7 @@
color: #FFF;
}
#boxlogin #forget,
#boxlogin #forget,
#footer-login a {
color: #424242;
}
......@@ -82,9 +81,9 @@ ul#menu ul li a {
/* ====== BUTTONS ====== */
input.submit,
input.submit,
span.vsubmit, a.vsubmit,
.ui-widget-content span.vsubmit, a.vsubmit,
.ui-widget-content span.vsubmit, a.vsubmit,
#BackToTop {
color: #353B17;
background-color: #BCDA1A;
......@@ -94,8 +93,8 @@ span.vsubmit, a.vsubmit,
text-decoration: underline;
}
input.submit:hover,
a.vsubmit:hover,
input.submit:hover,
a.vsubmit:hover,
#BackToTop:hover {
background-color: #BCDA1A;
}
......
/* ===== LOGIN ===== */
#firstboxlogin {
......@@ -6,7 +5,7 @@
}
#logo_login {
background: url(../../pics/login_logo_glpi.png) center no-repeat, #008B8D;
background: url(../../pics/login_logo_glpi.png) center no-repeat, #008B8D;
}
#display-login {
......@@ -65,7 +64,7 @@ ul#menu ul.ssmenu li.active > a {
color: #FFF;
}
ul#menu > li:hover,
ul#menu > li:hover,
ul#menu > li:hover > a {
background-color: #064260;
color: #fff;
......@@ -79,7 +78,7 @@ ul#menu ul li a:hover {
/* ====== BUTTONS ====== */
input.submit {
input.submit {
background-color: #bf0805;
color: #fff;
}
......
......@@ -8,7 +8,7 @@
based on GLPI - Gestionnaire Libre de Parc Informatique
Copyright (C) 2003-2014 by the INDEPNET Development Team.
-------------------------------------------------------------------------
LICENSE
......@@ -74,7 +74,7 @@ img {
small {
font-family: verdana;
font-size: 10px;
}
}
.b {
......@@ -109,7 +109,7 @@ small {
}
.red {
.red {
color:red;
}
.blue {
......@@ -153,8 +153,8 @@ hr {
/* ################--------------- Tabs ---------------#################### */
/* TODO improve display */
.alltab {
font-size:14px;
text-align:center;
font-size:14px;
text-align:center;
background-color:#CC9900;
padding: 5px;
font-weight: bold;
......@@ -168,7 +168,7 @@ hr {
/* ################--------------- Page ---------------#################### */
#page {
margin: 0 auto;
margin: 0 auto;
text-align:center;
}
......@@ -176,7 +176,7 @@ hr {
font-size: 12px;
margin:0;
margin-bottom:5px;
padding:0;
padding:0;
}
#page {
......@@ -224,13 +224,13 @@ input.submit {
border: 1px solid #888888;
background-color:#eeeeee;
cursor:pointer;
background: url("../pics/fond_form.png") repeat-x;
background: url("../pics/fond_form.png") repeat-x;
}
input.submit:hover {
border: 1px inset #888888;
background-color:#ffffff;
background: url("../pics/fond_form_on.png") repeat-x;
background: url("../pics/fond_form_on.png") repeat-x;
}
input[type=checkbox] {
......@@ -366,7 +366,7 @@ td { }
font-weight: bold;
background-color: #fccc6f;
text-align: center;
background: url("../pics/fond_th.png") repeat-x;
background: url("../pics/fond_th.png") repeat-x;
border-bottom:1px solid #cccccc;
}
......@@ -447,7 +447,7 @@ ul.autocomp {
text-align:left;
}
ul.autocomp li.selected {
ul.autocomp li.selected {
background-color: #FFF6CF;
}
......@@ -466,8 +466,8 @@ li.auto_comp {
.showplan {
font-weight: bold;
text-decoration: none;
color : #3A5693;
text-decoration: none;
color : #3A5693;
cursor:pointer;
}
......@@ -524,7 +524,7 @@ li.auto_comp {
.tdkb_result {
vertical-align:top;
text-align:left;