Mueve número de versión al rincón del usuario (a9acc658) · Commits · REDMIC Project / Client / Web

public/javascript/app/components/Topbar.js

+0 −11

Original line number	Diff line number	Diff line
		@@ -2,14 +2,12 @@ define([
		"dijit/layout/ContentPane"
		, "dojo/_base/declare"
		, "dojo/_base/lang"
		, "dojo/dom"
		, "put-selector/put"
		, "redmic/modules/base/Manager"
		], function(
		ContentPane
		, declare
		, lang
		, dom
		, put
		, Manager
		){
		@@ -46,15 +44,6 @@ define([

		this._createLogoNode();

		var envDfd = window.env;

		if (envDfd) {
		envDfd.then(lang.hitch(this, function(envData) {

		put(this.domNode, 'div.versionNumber', envData.version);
		}));
		}

		if (this.show.left) {
		this.leftNode = put(this.domNode, "div.manager");
		}

public/javascript/app/nls/es/translation.js

+2 −0

Original line number	Diff line number	Diff line
		@@ -244,6 +244,7 @@ define({
		, "destiny": "Destino (animales)"
		, "inspire-themes": "Temas Inspire"
		, "toponym-types": "Tipos de toponimia"
		, "toponymType": "Tipos de toponimia"

		, "recording-types": "Tipos de grabación"

		@@ -1206,6 +1207,7 @@ define({
		, "webcamUrl": "URL webcam"

		, "fullscreen": "Pantalla completa"
		, "version": "Versión"

		// Para capas que no se pueden cambiar las keys
		, "descript_1": "Descripción"

public/javascript/app/nls/translation.js

+1 −0

Original line number	Diff line number	Diff line
		@@ -1211,6 +1211,7 @@ define({
		, "webcamUrl": "Webcam URL"

		, "fullscreen": "Fullscreen"
		, "version": "Version"

		//Para capas que no se pueden cambiar las keys
		, "descript_1": "Description"

public/javascript/redmic/modules/layout/listMenu/ListMenu.js

+13 −1

Original line number	Diff line number	Diff line
		@@ -331,6 +331,7 @@ define([
		this._addLabel(item, node);
		this._addTitle(item.title, node);
		this._addHref(item.href, node);
		this._addNewPage(item.newPage, node);

		return node;
		},
		@@ -400,7 +401,18 @@ define([
		}

		node.setAttribute('href', href);
		if (href[0] === '/') {
		node.setAttribute('d-state-url', true);
		}
		},

		_addNewPage: function(newPage, node) {

		if (!newPage) {
		return;
		}

		node.setAttribute('target', '_blank');
		},

		_isSelectedItemAndProcessSelect: function(node, i) {

public/javascript/redmic/modules/user/UserArea.js

+70 −57

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ define([
		, Credentials
		, TemplateTopbarMenu
		) {

		return declare([_Module, _Show, _Store], {
		// summary:
		// Modulo para el menu de usuarios.
		@@ -51,7 +52,8 @@ define([
		omitLoading: true,
		'class': 'userArea',
		idProperty: 'id',
		target: redmicConfig.services.profile
		target: redmicConfig.services.profile,
		repositoryUrl: 'https://gitlab.com/redmic-project/client/web'
		};

		lang.mixin(this, this.config, args);
		@@ -62,14 +64,40 @@ define([
		put(this.domNode, '[title=$]', this.i18n.user);
		this.iconNode = put(this.domNode, 'i.fa.fa-user');

		var envDfd = window.env;
		if (!envDfd) {
		return;
		}

		envDfd.then(lang.hitch(this, function(envData) {

		var infoItem = {
		icon: 'fa-question-circle-o',
		label: 'whatIsRedmic',
		href: '/inner-what-is-redmic'
		};

		var versionItem = {
		icon: 'fa-code-fork',
		label: this.i18n.version + ': ' + envData.version,
		href: this.repositoryUrl,
		newPage: true
		};

		if (this._checkUserIsRegistered()) {
		this._initializeRegisteredUserArea();
		this._initializeRegisteredUserArea(infoItem, versionItem);

		this._logoutTarget = redmicConfig.getServiceUrl(redmicConfig.services.logout, envData);
		// TODO se reemplaza la terminación de la ruta al servidor porque las imágenes de los usuarios ya
		// la contienen. Cuando se corrija esta circunstancia, eliminar el reemplazo
		this._userImageBaseTarget = envData.apiUrl.replace('/api', '');
		} else {
		this._initializeGuestUserArea();
		this._initializeGuestUserArea(infoItem, versionItem);
		}
		}));
		},

		_initializeRegisteredUserArea: function() {
		_initializeRegisteredUserArea: function(infoItem, versionItem) {

		this.topbarMenu = new TemplateDisplayer({
		parentChannel: this.getChannel(),
		@@ -81,43 +109,46 @@ define([

		this.listMenu = new declare([ListMenu, _ShowOnEvt]).extend(_ShowInTooltip)({
		parentChannel: this.getChannel(),
		items: [{
		items: [
		{
		icon: 'fa-eye',
		label: 'myProfile',
		href: '/user'
		},{
		icon: 'fa-question-circle-o',
		label: 'whatIsRedmic',
		href: '/inner-what-is-redmic'
		},{
		},
		infoItem,
		{
		icon: 'fa-file-text-o',
		label: 'termCondition',
		href: '/inner-terms-and-conditions'
		},{
		},
		versionItem,
		{
		icon: 'fa-power-off',
		label: 'logout',
		callback: '_logout'
		}]
		}
		]
		});
		},

		_initializeGuestUserArea: function() {
		_initializeGuestUserArea: function(infoItem, versionItem) {

		this.listMenu = new declare([ListMenu, _ShowOnEvt]).extend(_ShowInTooltip)({
		parentChannel: this.getChannel(),
		items: [{
		icon: 'fa-question-circle-o',
		label: 'whatIsRedmic',
		href: '/inner-what-is-redmic'
		},{
		items: [
		infoItem,
		{
		icon: 'fa-user-plus',
		label: 'register',
		href: '/register'
		},{
		},
		versionItem,
		{
		icon: 'fa-sign-in',
		label: 'login',
		href: '/login'
		}]
		}
		]
		});

		this._showMenu();
		@@ -136,26 +167,8 @@ define([
		this.inherited(arguments);

		if (this._checkUserIsRegistered()) {
		this._prepareEnvironment();
		}
		},

		_prepareEnvironment: function() {

		var envDfd = window.env;
		if (!envDfd) {
		return;
		}

		envDfd.then(lang.hitch(this, function(envData) {

		this._logoutTarget = redmicConfig.getServiceUrl(redmicConfig.services.logout, envData);
		// TODO se reemplaza la terminación de la ruta al servidor porque las imágenes de los usuarios ya
		// la contienen. Cuando se corrija esta circunstancia, eliminar el reemplazo
		this._userImageBaseTarget = envData.apiUrl.replace('/api', '');

		this._showAreaForRegisteredUser();
		}));
		}
		},

		_showAreaForRegisteredUser: function() {