Avoid relaunching conf with dropdown + group some buttons

This commit is contained in:
Xavier Guimard 2016-01-19 18:25:00 +00:00
parent ca6ca12af2
commit 88eb9d47e5
6 changed files with 12 additions and 6 deletions

View File

@ -48,7 +48,6 @@ scripts/rotateOidcKeys
t/01-Common-Conf.t
t/02-Common-Conf-File.t
t/03-Common-Conf-CDBI.t
t/03-Common-Conf-DBI.t
t/03-Common-Conf-RDBI.t
t/04-Common-Conf-SOAP.t
t/05-Common-Conf-LDAP.t

View File

@ -66,6 +66,7 @@
"badUrl": "Bad URL",
"badValue": "Bad value",
"blackList": "Black list",
"browse": "Browse",
"browserIdAuthnLevel": "Authentication level",
"browserIdAutoLogin": "Automatic login",
"browserIdBackgroundColor": "Background color",

View File

@ -66,6 +66,7 @@
"badUrl": "Mauvaise URL",
"badValue": "Mauvaise valeur",
"blackList": "Liste noire",
"browse": "Naviguer",
"browserIdAuthnLevel": "Niveau d'authentification",
"browserIdAutoLogin": "Authentification automatique",
"browserIdBackgroundColor": "Couleur d'arrière plan",

View File

@ -22,9 +22,14 @@
<div class="navbar-collapse" ng-class="{'collapse':!showM}" id="formmenu">
<ul class="nav navbar-nav">
<li><a id="save" class="link" ng-click="save()" tabIndex="-1"><i class="glyphicon glyphicon-save"></i> {{translate('save')}}<input id="forcesave" type="checkbox" ng-model="forceSave" title="{{translate('forceSave')}}" ng-show="confirmNeeded"></a></li>
<li ng-class="{'disabled':!currentCfg.prev}"><a class="link" ng-click="currentCfg.prev && getCfg(currentCfg.prev)" title="Configuration {{currentCfg.prev}}"><i class="glyphicon glyphicon-arrow-left"></i> {{translate('previous')}}</a></li>
<li ng-class="{'disabled':!currentCfg.next}"><a class="link" ng-click="currentCfg.next && getCfg(currentCfg.next)" title="Configuration {{currentCfg.next}}"><i class="glyphicon glyphicon-arrow-right"></i> {{translate('next')}}</a></a></li>
<li><a class="link" ng-click="getCfg('latest')" title="Latest configuration"><i class="glyphicon glyphicon-refresh"></i> {{translate('latest')}}</a></li>
<li class="dropdown">
<a name="menu" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="caret"></span> {{translate('browse')}}</a>
<ul class="dropdown-menu">
<li ng-class="{'disabled':!currentCfg.prev}"><a class="link" ng-click="currentCfg.prev && getCfg(currentCfg.prev)" title="Configuration {{currentCfg.prev}}"><i class="glyphicon glyphicon-arrow-left"></i> {{translate('previous')}}</a></li>
<li ng-class="{'disabled':!currentCfg.next}"><a class="link" ng-click="currentCfg.next && getCfg(currentCfg.next)" title="Configuration {{currentCfg.next}}"><i class="glyphicon glyphicon-arrow-right"></i> {{translate('next')}}</a></a></li>
<li><a class="link" ng-click="getCfg('latest')" title="Latest configuration"><i class="glyphicon glyphicon-refresh"></i> {{translate('latest')}}</a></li>
</ul>
</li>
<li><a class="link hidden-xs" ng-click="showH=!showH"><i class="glyphicon" ng-class="{'glyphicon-eye-close': showH,'glyphicon-eye-open': !showH}" ></i> {{ translate((showH ? 'hideHelp' : 'showHelp')) }}</a></li>
<li ng-repeat="button in buttons" ng-include="'menubutton.html'"></li>
<li class="dropdown visible-xs">

View File

@ -25,7 +25,7 @@
</ul>
<ul class="hidden-xs nav navbar-nav navbar-right">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Menu <span class="caret"></span></a>
<a name="menu" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{translate('menu')}} <span class="caret"></span></a>
<ul class="dropdown-menu">
<li ng-repeat="menulink in menulinks"><a href="{{menulink.target}}"><i ng-if="menulink.icon" class="glyphicon glyphicon-{{menulink.icon}}"></i> {{translate(menulink.title)}}</a></li>
<li role="separator" class="divider"></li>

View File

@ -1,7 +1,7 @@
<!-- Menu dropdown template -->
<script type="text/ng-template" id="menubutton.html">
<a class="link" ng-if="!button.buttons" ng-click="menuClick(button)"><i class="glyphicon glyphicon-{{button.icon}}" ng-if="button.icon"></i> {{translateTitle(button)}}</a>
<a class="link" ng-if="button.buttons" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">{{translateTitle(button)}} <span class="caret"></span></a>
<a name="menu" ng-if="button.buttons" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="caret"></span> {{translateTitle(button)}} <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li ng-repeat="button in button.buttons" ng-include="'menubutton.html'" />
</ul>