Merge branch 'bootstrap' into 'v2.0'

improve vhost rule level column size in manager

See merge request lemonldap-ng/lemonldap-ng!111

lemonldap-ng-manager/site/htdocs/static/css/manager.css

@@ -44,8 +44,12 @@
 /* Tables */
 
 .panel .table th {
-  width: 10%;
   vertical-align: middle;
+  width: 10%;
+}
+
+.th_rulesAuthnLevel {
+    width: 2% !important;
 }
 
 /* Category tree */

lemonldap-ng-manager/site/htdocs/static/css/manager.min.css

@@ -1 +1 @@
-.tree-node{border-width:1px;border-style:solid;border-radius:4px;margin-bottom:8px}.tree-node-default{background:#fff}.angular-ui-tree-handle{cursor:pointer}#pleaseWait{background-color:#fff;width:100%;min-height:9.9%;height:auto;z-index:5000;position:absolute;left:0;top:0;margin-left:auto;margin-right:auto;padding:30% 20%;text-align:center;opacity:.8;filter:alpha(opacity=80)}.panel .table th{width:10%;vertical-align:middle}ul.cat-tree{list-style-type:square}p.cat-tree-category{font-weight:bold}html,body{margin:0;padding:0;height:100vh;background:radial-gradient(circle at 50% 0,#fff 0,#ddd 100%) no-repeat scroll 0 0 #ddd}header#navbar{height:9vh;margin-bottom:1vh;padding-bottom:0vh}#content{max-height:86vh;height:86vh;margin:0;padding:0;position:relative}header#navbar .navbar-brand{padding:10px 15px}header#navbar .navbar-brand img{background:#fff}textarea{width:100%}textarea#privateKey,textarea#publicKey,textarea#filetext{font-size:8pt}dl,.panel{margin-bottom:8px}.panel-body{padding:5px}.input-group-solid{border:1px solid #CCC;border-radius:4px;padding:6px 12px}.input-group>.input-group-solid:last-child{border-bottom-left-radius:0;border-top-left-radius:0}#cfgnum{position:relative}#cfgnum.label-warning:hover:after{content:attr(comment);padding:4px 8px;color:rgba(0,0,0,0.5);position:absolute;left:100%;bottom:100%;white-space:nowrap;z-index:2;border-radius:5px;background:#f0ad4e}.link{cursor:pointer}#bottom .panel{height:100%;margin-top:8px}#bottom .panel-body{height:100%}#right{display:flex;flex-direction:column}#bottom{flex:1}@media(min-width:768px){.scrollable-sm{max-height:86vh !important;overflow:auto}#right,#left{max-height:86vh !important;height:86vh}#top{overflow-x:hidden}#bottom{height:43vh;overflow:hidden}}#top,#bottom,#right,#left{position:relative}@media(max-width:767px){#right{position:absolute;top:0;z-index:1000}.lmmenu{position:static;float:left;width:100%;min-height:200px;margin-top:0;border:1px solid #ccc;box-shadow:none}#content{position:relative}}.scrollable{overflow:auto}.container{padding-bottom:15px}.hresizer{position:absolute;width:6px;top:0;bottom:0;right:0;background-color:#EEE;cursor:e-resize}.vresizer{position:absolute;height:6px;left:0;right:0;top:0;background-color:#EEE;cursor:n-resize}.angular-ui-tree-empty{min-height:auto;border:0}.old{color:#A00}.new{color:#0A0}.maxw{width:100%}.center{text-align:center}.backgrounddiv{margin-top:10px}.llcontainer{position:relative;margin-bottom:10px}.navbar-nav li{line-height:50px}
+.tree-node{border-width:1px;border-style:solid;border-radius:4px;margin-bottom:8px}.tree-node-default{background:#fff}.angular-ui-tree-handle{cursor:pointer}#pleaseWait{background-color:#fff;width:100%;min-height:9.9%;height:auto;z-index:5000;position:absolute;left:0;top:0;margin-left:auto;margin-right:auto;padding:30% 20%;text-align:center;opacity:.8;filter:alpha(opacity=80)}.panel .table th{vertical-align:middle;width:10%}.th_rulesAuthnLevel{width:2%!important}ul.cat-tree{list-style-type:square}p.cat-tree-category{font-weight:bold}html,body{margin:0;padding:0;height:100vh;background:radial-gradient(circle at 50% 0,#fff 0,#ddd 100%) no-repeat scroll 0 0 #ddd}header#navbar{height:9vh;margin-bottom:1vh;padding-bottom:0vh}#content{max-height:86vh;height:86vh;margin:0;padding:0;position:relative}header#navbar .navbar-brand{padding:10px 15px}header#navbar .navbar-brand img{background:#fff}textarea{width:100%}textarea#privateKey,textarea#publicKey,textarea#filetext{font-size:8pt}dl,.panel{margin-bottom:8px}.panel-body{padding:5px}.input-group-solid{border:1px solid #CCC;border-radius:4px;padding:6px 12px}.input-group>.input-group-solid:last-child{border-bottom-left-radius:0;border-top-left-radius:0}#cfgnum{position:relative}#cfgnum.label-warning:hover:after{content:attr(comment);padding:4px 8px;color:rgba(0,0,0,0.5);position:absolute;left:100%;bottom:100%;white-space:nowrap;z-index:2;border-radius:5px;background:#f0ad4e}.link{cursor:pointer}#bottom .panel{height:100%;margin-top:8px}#bottom .panel-body{height:100%}#right{display:flex;flex-direction:column}#bottom{flex:1}@media(min-width:768px){.scrollable-sm{max-height:86vh!important;overflow:auto}#right,#left{max-height:86vh!important;height:86vh}#top{overflow-x:hidden}#bottom{height:43vh;overflow:hidden}}#top,#bottom,#right,#left{position:relative}@media(max-width:767px){#right{position:absolute;top:0;z-index:1000}.lmmenu{position:static;float:left;width:100%;min-height:200px;margin-top:0;border:1px solid #ccc;box-shadow:none}#content{position:relative}}.scrollable{overflow:auto}.container{padding-bottom:15px}.hresizer{position:absolute;width:6px;top:0;bottom:0;right:0;background-color:#EEE;cursor:e-resize}.vresizer{position:absolute;height:6px;left:0;right:0;top:0;background-color:#EEE;cursor:n-resize}.angular-ui-tree-empty{min-height:auto;border:0}.old{color:#A00}.new{color:#0A0}.maxw{width:100%}.center{text-align:center}.backgrounddiv{margin-top:10px}.llcontainer{position:relative;margin-bottom:10px}.navbar-nav li{line-height:50px}

lemonldap-ng-manager/site/htdocs/static/forms/ruleContainer.html

@@ -5,11 +5,11 @@
   <table class="table table-striped">
     <thead>
       <tr>
-        <th width="20%" trspan="comments"></th>
+        <th trspan="comments"></th>
-        <th width="30%" trspan="regexps"></th>
+        <th trspan="regexps"></th>
-        <th width="40%" trspan="rules"></th>
+        <th trspan="rules"></th>
-        <th width="7%" trspan="rulesAuthnLevel"></th>
+        <th class="th_rulesAuthnLevel" trspan="rulesAuthnLevel"></th>
-        <th />
+        <th class="th_rulesAuthnLevel" />
       </tr>
     </thead>
     <tbody>

lemonldap-ng-manager/site/htdocs/static/languages/ar.json

@@ -770,7 +770,7 @@
 "rule":"القاعدة",
 "ruleAuthnLevel":"مستوى إثبات الهوية  واجب",
 "rules":"القواعد",
-"rulesAuthnLevel":"Required authentication levels",
+"rulesAuthnLevel":"Required auth levels",
 "Same":"نفسه",
 "save":"حفظ",
 "saveReport":"احفظ التقرير",
@@ -1082,4 +1082,4 @@
 "samlRelayStateTimeout":"تناوب حالة مهلة الجلسة ",
 "samlUseQueryStringSpecific":"استخدام أسلوب query_string المعين",
 "samlOverrideIDPEntityID":"Override Entity ID when acting as IDP"
-}
+}

lemonldap-ng-manager/site/htdocs/static/languages/de.json

@@ -770,7 +770,7 @@
 "rule":"Rule",
 "ruleAuthnLevel":"Required authentication level",
 "rules":"Regeln",
-"rulesAuthnLevel":"Required authentication levels",
+"rulesAuthnLevel":"Required auth levels",
 "Same":"Same",
 "save":"Save",
 "saveReport":"Save report",
@@ -1082,4 +1082,4 @@
 "samlRelayStateTimeout":"RelayState session timeout",
 "samlUseQueryStringSpecific":"Use specific query_string method",
 "samlOverrideIDPEntityID":"Override Entity ID when acting as IDP"
-}
+}

lemonldap-ng-manager/site/htdocs/static/languages/en.json

@@ -770,7 +770,7 @@
 "rule":"Rule",
 "ruleAuthnLevel":"Required authentication level",
 "rules":"Rules",
-"rulesAuthnLevel":"Required authentication levels",
+"rulesAuthnLevel":"Required auth levels",
 "Same":"Same",
 "save":"Save",
 "saveReport":"Save report",

lemonldap-ng-manager/site/htdocs/static/languages/fr.json

@@ -770,7 +770,7 @@
 "rule":"Règle",
 "ruleAuthnLevel":"Niveau d'authentication requis",
 "rules":"Règles",
-"rulesAuthnLevel":"Niveaux d'authentification requis",
+"rulesAuthnLevel":"Niveaux auth requis",
 "Same":"Identique",
 "save":"Sauver",
 "saveReport":"Rapport de sauvegarde",

lemonldap-ng-manager/site/htdocs/static/languages/it.json

@@ -770,7 +770,7 @@
 "rule":"Regola",
 "ruleAuthnLevel":"Livello di autenticazione richiesto",
 "rules":"Regole",
-"rulesAuthnLevel":"Required authentication levels",
+"rulesAuthnLevel":"Required auth levels",
 "Same":"Stesso",
 "save":"Salva",
 "saveReport":"Salva report",
@@ -1082,4 +1082,4 @@
 "samlRelayStateTimeout":"Timeout di sessione di RelayState",
 "samlUseQueryStringSpecific":"Utilizza il metodo specifico query_string",
 "samlOverrideIDPEntityID":"Sostituisci l'ID entità quando agisce come IDP"
-}
+}

lemonldap-ng-manager/site/htdocs/static/languages/vi.json

@@ -770,7 +770,7 @@
 "rule":"Quy tắc",
 "ruleAuthnLevel":"Required authentication level",
 "rules":"Quy tắc",
-"rulesAuthnLevel":"Required authentication levels",
+"rulesAuthnLevel":"Required auth levels",
 "Same":"Tương tự",
 "save":"Lưu",
 "saveReport":"Lưu báo cáo",
@@ -1082,4 +1082,4 @@
 "samlRelayStateTimeout":"Thời gian hết hạn phiên RelayState ",
 "samlUseQueryStringSpecific":"Sử dụng phương pháp query_string cụ thể",
 "samlOverrideIDPEntityID":"Override Entity ID when acting as IDP"
-}
+}

lemonldap-ng-manager/site/htdocs/static/languages/zh.json

@@ -770,7 +770,7 @@
 "rule":"Rule",
 "ruleAuthnLevel":"Required authentication level",
 "rules":"Rules",
-"rulesAuthnLevel":"Required authentication levels",
+"rulesAuthnLevel":"Required auth levels",
 "Same":"Same",
 "save":"Save",
 "saveReport":"Save report",
@@ -1082,4 +1082,4 @@
 "samlRelayStateTimeout":"RelayState session timeout",
 "samlUseQueryStringSpecific":"Use specific query_string method",
 "samlOverrideIDPEntityID":"Override Entity ID when acting as IDP"
-}
+}