diff --git a/src/vitis/client/templates/mainTpl.html b/src/vitis/client/templates/mainTpl.html index 47144886f08a7a513c206c8370a92fee4decf11b..64706b13a1fc4b77f63c4dc38e0036ede4361aba 100755 --- a/src/vitis/client/templates/mainTpl.html +++ b/src/vitis/client/templates/mainTpl.html @@ -22,12 +22,12 @@ <nav id="object_column"> <a ng-repeat="object in objects|filter: {display_menu: true} track by $index" ng-click="selectObject(object.name, object.startMode, $event)" ng-class="{object_link_selected: (object.name == sSelectedObjectName)}" id="object_column_{{object.name}}" href="#" class="object_link" ng-bind="object.label"></a> </nav> - </div> + </div> </div> </header> <section id="works_line" class="row works_line"> <!-- menu des modes --> - <div id="mode_column_layout" ng-class="{'col-xs-1':!$root.is_mobile, 'hidden':$root.is_mobile}"> + <div id="mode_column_layout" ng-class="{'col-xs-1':!$root.is_mobile, 'hidden':$root.is_mobile, 'hidden':(modes.length === 1 && modes[0].mode_id === 'vmap')}"> <button type="button" class="row btn button_mode button_mode_top" ng-show="showModeScrollBoutton()" ng-click="scrollMode(-50)"><i class="icon icon-keyboard_arrow_up"></i></button> <nav id="mode_column" class="row mode_column no_bs_padding"> <ul class="list-unstyled"> @@ -39,7 +39,7 @@ <button type="button" class="row btn button_mode button_mode_down" ng-show="showModeScrollBoutton()" ng-click="scrollMode(50)"><i class="icon icon-keyboard_arrow_down"></i></button> </div> <!-- Container des object de l'application --> - <section id="data_column" class="data_column no_bs_padding no_overflow" ng-class="{'col-xs-11':!$root.is_mobile, 'col-xs$root is_mobile':$root.is_mobile}"> + <section id="data_column" class="data_column no_bs_padding no_overflow" ng-class="{'col-xs-11':!$root.is_mobile, 'col-xs$root is_mobile':$root.is_mobile, 'width-100':(modes.length === 1 && modes[0].mode_id === 'vmap')}"> <!-- Objests de l'application --> <div ng-repeat="mode in ::modes track by $index" id="container_mode_{{::mode.mode_id}}" class="container-mode"></div> </section> @@ -53,4 +53,4 @@ <img src="images/logo-veremes.png"> </div> </footer> -</div> \ No newline at end of file +</div> diff --git a/src/vitis/vas/rest/conf/selected_properties.inc b/src/vitis/vas/rest/conf/selected_properties.inc index 6f49e8d8d2b8d7d3e31607fbd65892a88fa88486..309b082d049ad695cec58e0d9e4238b43e1f7c6d 100644 --- a/src/vitis/vas/rest/conf/selected_properties.inc +++ b/src/vitis/vas/rest/conf/selected_properties.inc @@ -42,6 +42,7 @@ $aAdminFields = Array( 'public_login', 'public_password', 'public_token', + 'public_user', 'shared_dir', 'domain', 'domain.*', @@ -102,6 +103,7 @@ $aUserFields = Array( 'date_format', 'debug_mode', 'public_alias', + 'public_user', 'services_alias', 'doc_alias', 'ws_data_alias', diff --git a/src/vitis/vas/rest/ws/vitis/Properties.class.inc b/src/vitis/vas/rest/ws/vitis/Properties.class.inc index c7f65b413b16534d0349e47a7b9a0a420d1ba76a..0e5faa3b59c434e84d4d45447b10139446866eaf 100755 --- a/src/vitis/vas/rest/ws/vitis/Properties.class.inc +++ b/src/vitis/vas/rest/ws/vitis/Properties.class.inc @@ -80,13 +80,19 @@ class Properties extends Vitis { */ function GET() { + if ($this->aValues['token'] === $this->aProperties['public_token']) { + $this->aProperties['public_user'] = true; + } else { + $this->aProperties['public_user'] = false; + } + if (isset($this->aSelectedFields) && !empty($this->aSelectedFields)) { $this->aFields = $this->getSelectedFields($this->aProperties); } else { $this->aFields = $this->aProperties; } - require_once dirname($_SERVER['SCRIPT_FILENAME']) . "/conf/version.inc"; + require_once dirname($_SERVER['SCRIPT_FILENAME']) . "/conf/version.inc"; if (VM_STATUS != "STABLE") { $this->aFields['VM_STATUS'] = "UNSTABLE"; } else {