Merge branch 'update-logos-ui' of oscarleiva/energylink into master

Actualización de logos e interfaz gráfica

pkg/api/index.go

@@ -342,7 +342,7 @@ func (hs *HTTPServer) setIndexViewData(c *m.ReqContext) (*dtos.IndexViewData, er
 		HideFromMenu: true,
 		Children: []*dtos.NavLink{
 			{Text: "Keyboard shortcuts", Url: "/shortcuts", Icon: "fa fa-fw fa-keyboard-o", Target: "_self"},
-			{Text: "Get support", Url: "https://mercadoselectricos.com.sv/contacto", Icon: "fa fa-fw fa-comment", Target: "_blank"},
+			{Text: "Soporte", Url: "mailto:contacto@grupomerelec.com", Icon: "fa fa-fw fa-comment", Target: "_blank"},
 			// {Text: "Documentation", Url: "http://docs.grafana.org", Icon: "fa fa-fw fa-file", Target: "_blank"},
 		},
 	})

public/app/core/controllers/reset_password_ctrl.ts

@@ -21,7 +21,7 @@ export class ResetPasswordCtrl {
       main: {
         icon: 'gicon gicon-branding',
         text: 'Reset Password',
-        subTitle: 'Reset your EnergyLink password',
+        subTitle: 'Restaurar contraseña de Energylink',
         breadcrumbs: [{ title: 'Login', url: 'login' }],
       },
     };

public/app/partials/reset_password.html

@@ -2,7 +2,8 @@
 
 <div class="page-container page-body">
 	<div class="signup">
-		<h3 class="p-b-1">Reset password</h3>
+		<h3 class="p-b-1">Restaurar Password</h3>
+		<p>Ingresa tu nombre de usuario o tu contraseña para poder restaurar tu password.</p>
 
 		<div ng-if="ldapEnabled || authProxyEnabled">
 			You cannot reset password when LDAP or Auth Proxy authentication is enabled.
@@ -17,17 +18,17 @@
 			</div>
 			<div class="gf-form-button-row">
 				<button type="submit" class="btn btn-primary" ng-click="sendResetEmail();" ng-disabled="!sendResetForm.$valid">
-					Reset Password
+					Restaurar Password
 				</button>
 				<a href="login" class="btn btn-inverse">
-					Back
+					Atrás
 				</a>
 
 			</div>
 		</form>
 		<div ng-show="mode === 'email-sent'">
-			An email with a reset link has been sent to the email address. <br>
-			You should receive it shortly.
+			Se ha enviado un correo electrónico con un enlace de restablecimiento a la dirección de correo electrónico.<br>
+			Debería recibirlo en breve.
 			<div class="p-t-1">
 				<a href="login" class="btn btn-primary p-t-1">
 					Login
@@ -36,11 +37,11 @@
 		</div>
 		<form name="resetForm" class="login-form gf-form-group" ng-show="mode === 'reset'">
 			<div class="gf-form">
-				<span class="gf-form-label width-9">New Password</span>
+				<span class="gf-form-label width-9">Nuevo Password</span>
 				<input type="password" name="NewPassword" class="gf-form-input max-width-14" required ng-minlength="4" ng-model='formModel.newPassword' placeholder="password" watch-change="formModel.newPassword = inputValue;">
 			</div>
 			<div class="gf-form">
-				<span class="gf-form-label width-9">Confirm Password</span>
+				<span class="gf-form-label width-9">Confirmar Password</span>
 				<input type="password" name="ConfirmPassword" class="gf-form-input max-width-14" required ng-minlength="4" ng-model='formModel.confirmPassword' placeholder="confirm password">
 			</div>
 			<div class="signup__password-strength">
@@ -48,7 +49,7 @@
 			</div>
 			<div class="gf-form-button-row">
 				<button type="submit" class="btn btn-primary" ng-click="submitReset();" ng-disabled="!resetForm.$valid">
-					Reset Password
+					Restaurar Password
 				</button>
 			</div>
 		</form>

public/img/energylink_icon.svg

@@ -1,19 +1,48 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   id="svg3494"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="363"
+   height="363"
+   viewBox="0 0 96.043747 96.043747"
    version="1.1"
-   viewBox="0 0 96.043755 96.043755"
-   height="96.043755mm"
-   width="96.043755mm">
+   id="svg1012"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="energylink_icon.svg">
   <defs
-     id="defs3488" />
+     id="defs1006" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="380.07143"
+     inkscape:cy="-49.928576"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     units="px"
+     inkscape:window-width="1366"
+     inkscape:window-height="715"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
   <metadata
-     id="metadata3491">
+     id="metadata1009">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -25,62 +54,45 @@
     </rdf:RDF>
   </metadata>
   <g
-     transform="translate(162.07619,22.503275)"
-     id="layer1">
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(123.61711,-39.579315)">
     <g
-       id="g2275"
-       transform="matrix(1.5085714,0,0,1.5085714,-179.66512,-208.27783)"
-       style="stroke-width:0.66287881">
-      <g
-         transform="translate(-200.09115,95.498048)"
-         id="g2273"
-         style="stroke-width:0.66287881">
-        <circle
-           style="opacity:1;fill:#fcb122;fill-opacity:1;stroke:none;stroke-width:1.06985879;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke"
-           id="circle2259"
-           cx="243.58316"
-           cy="59.480648"
-           r="31.832682" />
-        <g
-           id="g2271"
-           transform="matrix(1.0007031,0,0,1.0051995,60.862184,23.778766)"
-           style="opacity:1;stroke-width:0.66092998">
-          <path
-             id="path2261"
-             d="m 183.82493,18.567342 c 1.89981,0 3.42926,1.6434 3.42926,3.684753 v 26.530231 c 0,2.041359 -1.52945,3.684752 -3.42926,3.684752 h -6.17265 c -1.63604,0 -2.99446,-1.22004 -3.34096,-2.862127 -0.30812,0.06409 -0.62639,0.09856 -0.95247,0.09856 h -8.90235 c -2.73994,0 -4.94583,-2.37025 -4.94583,-5.314333 V 26.645244 c 0,-2.944081 2.20589,-5.314337 4.94583,-5.314337 h 8.90235 c 0.32596,0 0.64403,0.03497 0.95205,0.09903 0.34631,-1.642367 1.70517,-2.862592 3.34138,-2.862592 z"
-             style="opacity:1;fill:#80888f;fill-opacity:1;stroke:none;stroke-width:1.06671321;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke" />
-          <g
-             style="fill:#80888f;fill-opacity:1;stroke-width:0.82799894"
-             transform="matrix(-0.76576576,0,0,0.83206106,297.16508,-35.247382)"
-             id="g2267">
-            <rect
-               style="opacity:1;fill:#80888f;fill-opacity:1;stroke:none;stroke-width:1.33635592;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke"
-               id="rect2263"
-               width="22.944336"
-               height="6.3597097"
-               x="119.47591"
-               y="72.565742"
-               rx="4.1341147" />
-            <rect
-               rx="4.1341147"
-               y="91.169258"
-               x="119.47591"
-               height="6.3597097"
-               width="22.944336"
-               id="rect2265"
-               style="opacity:1;fill:#80888f;fill-opacity:1;stroke:none;stroke-width:1.33635592;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke" />
-          </g>
-          <path
-             d="m 168.66763,36.333788 3.21381,-3.213808 12.35735,12.357334 z m 9.4296,-1.63316 -3.21381,3.213814 -12.35733,-12.357333 z"
-             style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.17487103px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             id="path2269" />
-        </g>
-      </g>
+       inkscape:export-ydpi="96"
+       inkscape:export-xdpi="96"
+       inkscape:export-filename="C:\Users\oleiva\Documents\dev\energylink\fav32.png"
+       id="g996"
+       transform="matrix(0.26057422,0,0,-0.26057422,-50.089084,96.509122)">
+      <path
+         d="M 0,0 C -2.722,1.815 -7.514,2.722 -14.365,2.722 H -89.37 c -5.648,0 -10.387,-0.255 -14.214,-0.756 -3.833,-0.505 -6.91,-1.663 -9.225,-3.478 -2.32,-1.815 -3.984,-4.437 -4.99,-7.864 -1.012,-3.43 -1.513,-8.065 -1.513,-13.911 v -8.772 H 4.083 v 21.171 C 4.083,-5.444 2.722,-1.814 0,0"
+         style="fill:#ffb300;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path994"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       inkscape:export-ydpi="96"
+       inkscape:export-xdpi="96"
+       inkscape:export-filename="C:\Users\oleiva\Documents\dev\energylink\fav32.png"
+       id="g1000"
+       transform="matrix(0.26057422,0,0,-0.26057422,-37.28288,112.42805)">
+      <path
+         d="m 0,0 h -168.458 v -7.562 c 0,-5.042 0.401,-9.072 1.209,-12.096 0.804,-3.026 2.268,-5.398 4.385,-7.108 2.117,-1.715 4.939,-2.873 8.469,-3.479 3.525,-0.605 7.91,-0.906 13.156,-0.906 h 53.229 v -34.176 h -53.229 c -26.01,0 -44.562,4.939 -55.648,14.819 -11.092,9.876 -16.635,25.707 -16.635,47.484 V 34.78 c 0,11.894 1.158,21.926 3.478,30.092 2.316,8.166 6.351,14.716 12.098,19.658 5.746,4.94 13.354,8.517 22.834,10.738 9.475,2.216 21.473,3.326 35.99,3.326 h 79.238 c 11.692,0 21.421,-1.11 29.186,-3.326 7.759,-2.221 13.912,-5.293 18.448,-9.225 4.537,-3.932 7.712,-8.671 9.528,-14.215 C -0.908,66.281 0,60.283 0,53.834 Z M -331.323,-89.015 H 37.262 V 279.57 h -368.585 z"
+         style="fill:#ffb300;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path998"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       inkscape:export-ydpi="96"
+       inkscape:export-xdpi="96"
+       inkscape:export-filename="C:\Users\oleiva\Documents\dev\energylink\fav32.png"
+       transform="matrix(0.26057422,0,0,-0.26057422,-37.28288,112.42805)"
+       id="g1004">
+      <path
+         inkscape:connector-curvature="0"
+         id="path1002"
+         style="fill:#ffb300;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 0,0 h -168.458 v -7.562 c 0,-5.042 0.401,-9.072 1.209,-12.096 0.804,-3.026 2.268,-5.398 4.385,-7.108 2.117,-1.715 4.939,-2.873 8.469,-3.479 3.525,-0.605 7.91,-0.906 13.156,-0.906 h 53.229 v -34.176 h -53.229 c -26.01,0 -44.562,4.939 -55.648,14.819 -11.092,9.876 -16.635,25.707 -16.635,47.484 V 34.78 c 0,11.894 1.158,21.926 3.478,30.092 2.316,8.166 6.351,14.716 12.098,19.658 5.746,4.94 13.354,8.517 22.834,10.738 9.475,2.216 21.473,3.326 35.99,3.326 h 79.238 c 11.692,0 21.421,-1.11 29.186,-3.326 7.759,-2.221 13.912,-5.293 18.448,-9.225 4.537,-3.932 7.712,-8.671 9.528,-14.215 C -0.908,66.281 0,60.283 0,53.834 Z M -331.323,-89.015 H 37.262 V 279.57 h -368.585 z" />
     </g>
   </g>
-  <style
-     type="text/css"
-     id="style4061">
-	.st0{fill:url(#SVGID_1_);}
-</style>
 </svg>