Merge pull request SoftwareDefinedBuildings#26 from rajasriramoju/24-…

…merge-login title
phgupta · May 14, 2019 · ba61bd9 · ba61bd9
2 parents a270453 + 203cf87
commit ba61bd9
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 20 deletions.
diff --git a/dashboards/solarplus-ui/static/assets/css/style.css b/dashboards/solarplus-ui/static/assets/css/style.css
@@ -150,7 +150,7 @@ p {
   width: 1000px;
   margin: auto;
   padding-top: 50px;
-  padding-left: 10%;
+  padding-left: 19vw;
 
 }
 

diff --git a/dashboards/solarplus-ui/templates/DR.html b/dashboards/solarplus-ui/templates/DR.html
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-	<title>XBOS Dashboard</title>
+	<title>SolarPlus</title>
 	<meta charset='utf-8'>
 	<meta name='viewport' content='width=device-width,initial-scale=1.0'>
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
@@ -21,7 +21,7 @@
 	<div class="navbar-fixed">
 		<nav>
 			<div class="nav-wrapper tp-blue">
-				<a href="/index" class="brand-logo">XBOS-DR</a>
+				<a href="/index" class="brand-logo">SolarPlus</a>
 				<ul id="nav-mobile" class="right hide-on-med-and-down">
 					<li><a href="/dashboard">Dashboard</a></li>
 					<li><a href="/setpoints">Setpoints</a></li>

diff --git a/dashboards/solarplus-ui/templates/dashboard.html b/dashboards/solarplus-ui/templates/dashboard.html
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-	<title>XBOS Dashboard</title>
+	<title>SolarPlus</title>
 	<meta charset='utf-8'>
 	<meta name='viewport' content='width=device-width,initial-scale=1.0'>
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
@@ -20,12 +20,12 @@
 	<div class="navbar-fixed">
 		<nav>
 			<div class="nav-wrapper tp-blue">
-				<a href="/index" class="brand-logo">XBOS-DR</a>
+				<a href="/index" class="brand-logo">SolarPlus</a>
 				<ul id="nav-mobile" class="right hide-on-med-and-down">
 					<li class="active"><a href="#">Dashboard</a></li>
 					<li><a href="/setpoints">Setpoints</a></li>
 					<li><a href="/weather">Weather</a></li>
-					<li><a href="/DR">DR</a></li>
+					<!-- <li><a href="/DR">DR</a></li> -->
 					<li><a href="/intelligence">Intelligence</a></li>
 					<li><a id="logout-button" href="/logout">Logout</a></li>
 				</ul>

diff --git a/dashboards/solarplus-ui/templates/index.html b/dashboards/solarplus-ui/templates/index.html
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-	<title>XBOS Dashboard</title>
+	<title>SolarPlus</title>
 	<meta charset='utf-8'>
 	<meta name='viewport' content='width=device-width,initial-scale=1.0'>
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
@@ -21,15 +21,15 @@
 	<div class="navbar-fixed">
 		<nav>
 			<div class="nav-wrapper tp-blue">
-				<a href="/index" class="brand-logo">XBOS-DR</a>
+				<a href="/index" class="brand-logo">SolarPlus</a>
 				<ul id="nav-mobile" class="right hide-on-med-and-down">
 					<!-- {% if not g.user %}
 					<li><a href="/login">Login / Register</a></li>
 					{% else %} -->
 					<li><a href="/dashboard">Dashboard</a></li>
 					<li><a href="/setpoints">Setpoints</a></li>
 					<li><a href="/weather">Weather</a></li>
-					<li><a href="/DR">DR</a></li>
+					<!-- <li><a href="/DR">DR</a></li> -->
 					<li><a href="/intelligence">Intelligence</a></li>
 					<li><a id="logout-button" href="/logout">Logout</a></li>
 					<!-- {% endif %} -->
@@ -55,7 +55,7 @@ <h1 class="text-center">Simple Flask App</h1>
 		<h1 class="text-center">Dashboard</h1>
 		<div class="row">
 			<div class="col-sm-8 offset-sm-2">
-					<p>Welcome,<code>{{ g.user.profile.firstName }}</code> !</p>
+					<p>Welcome,<code>{{ g.user.profile.email }}</code> !</p>
 				<p>Your user information has been pulled from the <code>g.user</code>
 					object, which makes accessing your user information simple. Your first
 					name, for example, is available via the <code>g.user.profile.firstName</code>

diff --git a/dashboards/solarplus-ui/templates/intelligence.html b/dashboards/solarplus-ui/templates/intelligence.html
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-	<title>XBOS Dashboard</title>
+	<title>SolarPlus</title>
 	<meta charset='utf-8'>
 	<meta name='viewport' content='width=device-width,initial-scale=1.0'>
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
@@ -20,7 +20,7 @@
 	<div class="navbar-fixed">
 		<nav>
 			<div class="nav-wrapper tp-blue">
-				<a href="/index" class="brand-logo">XBOS-DR</a>
+				<a href="/index" class="brand-logo">SolarPlus</a>
 				<ul id="nav-mobile" class="right hide-on-med-and-down">
 					<li>
 						<div id="intelligent-control"></div>
@@ -33,7 +33,7 @@ <h6>Intelligent Control off</h6>
 					<li><a href="/dashboard">Dashboard</a></li>
 					<li><a href="/setpoints">Setpoints</a></li>
 					<li><a href="/weather">Weather</a></li>
-					<li><a href="/DR">DR</a></li>
+					<!-- <li><a href="/DR">DR</a></li> -->
 					<li class="active"><a href="#">Intelligence</a></li>
 					<li><a id="logout-button" href="/logout">Logout</a></li>
 				</ul>

diff --git a/dashboards/solarplus-ui/templates/landing.html b/dashboards/solarplus-ui/templates/landing.html
@@ -23,7 +23,7 @@
   <div id="w">
     <div id="content">
       <h1>Welcome to Solarplus-Dev!</h1>
-      <p>Click this to sign up/login to the Solarplus-Dev portal</p>
+      <p>Click this to sign up/login to the Solarplus portal</p>
       <center>
         <a href="/login" class="flatbtn" id="newmodaltrigger">Login / Sign Up</a>
         <!-- <a href="#loginmodal" class="flatbtn" id="modaltrigger">Login</a> -->

diff --git a/dashboards/solarplus-ui/templates/setpoints.html b/dashboards/solarplus-ui/templates/setpoints.html
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-	<title>XBOS Dashboard</title>
+	<title>SolarPlus</title>
 	<meta charset='utf-8'>
 	<meta name='viewport' content='width=device-width,initial-scale=1.0'>
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
@@ -18,12 +18,12 @@
 	<div class="navbar-fixed">
 		<nav>
 			<div class="nav-wrapper tp-blue">
-				<a href="/index" class="brand-logo">XBOS-DR</a>
+				<a href="/index" class="brand-logo">SolarPlus</a>
 				<ul id="nav-mobile" class="right hide-on-med-and-down">
 					<li><a href="/dashboard">Dashboard</a></li>
 					<li class="active"><a href="#">Setpoints</a></li>
 					<li><a href="/weather">Weather</a></li>
-					<li><a href="/DR">DR</a></li>
+					<!-- <li><a href="/DR">DR</a></li> -->
 					<li><a href="/intelligence">Intelligence</a></li>
 					<li><a id="logout-button" href="/logout">Logout</a></li>
 				</ul>

diff --git a/dashboards/solarplus-ui/templates/weather.html b/dashboards/solarplus-ui/templates/weather.html
@@ -5,7 +5,7 @@
 
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
-	<title>XBOS Dashboard</title>
+	<title>SolarPlus</title>
 	<meta charset='utf-8'>
 	<meta name='viewport' content='width=device-width,initial-scale=1.0'>
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
@@ -36,12 +36,12 @@
 	<div class="navbar-fixed">
 		<nav>
 			<div class="nav-wrapper tp-blue">
-				<a href="/index" class="brand-logo">XBOS-DR</a>
+				<a href="/index" class="brand-logo">SolarPlus</a>
 				<ul id="nav-mobile" class="right hide-on-med-and-down">
 					<li><a href="/dashboard">Dashboard</a></li>
 					<li><a href="/setpoints">Setpoints</a></li>
 					<li class="active"><a href="#">Weather</a></li>
-					<li><a href="/DR">DR</a></li>
+					<!-- <li><a href="/DR">DR</a></li> -->
 					<li><a href="/intelligence">Intelligence</a></li>
 					<li><a id="logout-button" href="/logout">Logout</a></li>
 				</ul>