Merge branch 'dev' into feature/US-47
This commit is contained in:
		
						commit
						ddacedb899
					
				| 
						 | 
				
			
			@ -5,6 +5,6 @@ export const TIENDA_PLANTILLA_ROUTE: Route = {
 | 
			
		|||
  path: 'tienda-plantilla',
 | 
			
		||||
  component: ListarTiendaPlantillaComponent,
 | 
			
		||||
  data: {
 | 
			
		||||
    pageTitle: 'tiendaPlantilla.title',
 | 
			
		||||
    pageTitle: 'dataSurveyApp.tiendaPlantilla.title',
 | 
			
		||||
  },
 | 
			
		||||
};
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -3,7 +3,7 @@
 | 
			
		|||
    <div class="container-fluid navbar navbar-marketing navbar-expand-lg bg-white navbar-light">
 | 
			
		||||
      <div class="container px-5 py-4">
 | 
			
		||||
        <a class="text-dark" routerLink="login"
 | 
			
		||||
          ><img src="src/main/webapp/content/img_datasurvey/datasurvey-logo-text-black.svg" width="300" alt=""
 | 
			
		||||
          ><img src="./../../content/img_datasurvey/datasurvey-logo-text-black.svg" width="300" alt=""
 | 
			
		||||
        /></a>
 | 
			
		||||
 | 
			
		||||
        <div class="col-6" style="text-align: end">
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -74,7 +74,7 @@ export const USER_ROUTES: RouteInfo[] = [
 | 
			
		|||
    path: '/encuesta',
 | 
			
		||||
    title: 'Encuestas',
 | 
			
		||||
    type: 'link',
 | 
			
		||||
    icontype: 'nc-icoxn nc-paper',
 | 
			
		||||
    icontype: 'nc-icon nc-paper',
 | 
			
		||||
  },
 | 
			
		||||
  { path: '/tienda-plantilla', title: 'Tienda', type: 'link', icontype: 'nc-icon nc-shop' },
 | 
			
		||||
  // {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -0,0 +1,7 @@
 | 
			
		|||
{
 | 
			
		||||
  "dataSurveyApp": {
 | 
			
		||||
    "tiendaPlantilla": {
 | 
			
		||||
      "title": "Tienda"
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
		Loading…
	
		Reference in New Issue