Added matrix info and changed css

Changed some CSS so that the background was consistant to what it use to be once upon a time.
I also re-arranged the homepage and added a separate page for matrix chat info. 
TODO: I will be adding more such as a howto guide later.

smsproj.py

@@ -280,11 +280,7 @@ def testAjax():
 
 @app.route('/inbox')
 def inbox():
-    if app_auth.is_logged_in():
+    return short_render('inbox.html')
-        loggedin = True
-    else:
-        loggedin = False
-    return flask.render_template('inbox.html', loggedin=loggedin)
 
 
 @app.route('/getInbox', methods=['GET'])
@@ -322,46 +318,39 @@ def returnInbox():
 def launchPage():
     if app_debug == '1':
         pprint.pprint(flask.session)
-    if app_auth.is_logged_in():
-        loggedin = True
-    else:
-        loggedin = False
-
     if app_debug == '1':
         pprint.pprint(loggedin)
         pprint.pprint("loggedin")
 
-    return flask.render_template('launch.html', loggedin=loggedin)
+    return short_render('launch.html')
 
 
 @app.route('/pp')
 def PrivacyPolicy():
     if app_debug == '1':
         pprint.pprint(flask.session)
-    if app_auth.is_logged_in():
+    return short_render('pp.html')
-        loggedin = True
-    else:
-        loggedin = False
-    return flask.render_template('pp.html', loggedin=loggedin)
 
 
 @app.route('/tos')
 def tos():
-    if app_auth.is_logged_in():
+    return short_render('tos.html')
-        loggedin = True
-    else:
-        loggedin = False
-    return flask.render_template('tos.html', loggedin=loggedin)
 
 
 @app.route('/about')
 def about():
+    return short_render('about.html')
+
+@app.route('/matrix')
+def matrix_info():
+    return short_render('matrix.html')
+
+def short_render(template_file):
     if app_auth.is_logged_in():
         loggedin = True
     else:
         loggedin = False
-    return flask.render_template('about.html', loggedin=loggedin)
+    return flask.render_template(template_file, loggedin=loggedin)
-
 
 if __name__ == '__main__':
     #app.run(host="0.0.0.0", port=int("8890"))

static/main.css

@@ -1,6 +1,6 @@
 body {
-    background-color: #CDB4DB;
+    background-color: #1D2F2E;
-    color: #000;
+    color: #fff;
 }
 /************
  * 1D2F2E
@@ -10,10 +10,10 @@ body {
  * AF3E4D
  ************/
 
-a {color: #138;}
+a {color: #ACF39D;}
-a:visited {color: #238;}
+a:visited {color: #B0C592;}
-a:hover, a:active {color: #34;}
+a:hover, a:active {color: #AF3E4D;}
-a:disabled {color: #9BB291;}
+a:disabled {color: #A97C73;}
 
 
 .ts {
@@ -72,7 +72,7 @@ a:disabled {color: #9BB291;}
 #bodypane {
   float: left;
   width: 80%;
-  background-color: #CDB4DB;
+  background-color: #1D2F2E;
 }
 #footer {
   align-content: center;
@@ -80,7 +80,7 @@ a:disabled {color: #9BB291;}
   width: 100%;
 }
 #navblock {
-  background-color: #CDB4DB;
+  background-color: #2E413F;
   width: 15%;
   float: left;
   margin:5px 10px 20px 20px;

templates/homepage.html

@@ -10,25 +10,19 @@ $("document").ready(function() {
 <h1>TheWords.faith Home Page</h1>
 <img src='static/thewords.faith-favico-v1.2.png' alt='TheWords.Faith Alpha Logo' />
 <div id='indexabout'>
-  <p>TheWords.faith is a communications site and integrated into our <a href="https://matrix.org">Matrix</a> server.</p>
+  <p>TheWords.faith is a communications site and integrated into our <a href="https://matrix.org">Matrix</a> service.</p>
-  <p>You can connect to the matrix home server with any standard matrix client by setting your homeserver to <a href="https://thewords.faith">thewords.faith</a>.
-     <a href="https://thewords.faith">TheWords.faith</a> matrix server should support email verification as well as VoIP and Video calls.</p>
-  <p>Any Matrix compattable client will work. Our offical one is at <a href="https://app.thewords.faith">app.thewords.faith</a> however are several other web clients such as, <a href="https://app.element.io/#/welcome">Element Web</a>,
-     <a href="https://app.schildi.chat/">Schildi Chat Web</a>, <a href="https://app.cinny.in/">Cinny</a> or my favorite <a href="https://fluffychat.im/web/#/home">fluffychat.im</a>. For native apps I suggest
-    <a href="https://schildi.chat/">SchildiChat</a> for your phone or desktop.
-    Or my favorite for smaller screens, <a href="https://fluffychat.im/en/">fluffychat.im</a> for android/ios.</p>
-    <p>For a list of all the clients available check out <a href="https://matrix.org/docs/projects/try-matrix-now/">matrix clients</a>.</p>
   <p>Right now we are not even in beta, and the service isn't ready for the world yet.
     At least until we get some more testers.</p>
   <p>This site, in the end, will allow users to send text messages to the US for a low monthly fee.
     This allows businesses or end users who want privacy minded or a business sms number that
     allows you to stay in touch with your customers by providing SMS and eventually MMS support.</p>
-    <h3>This is a public service. There are no logs stored only encrypted datasets. Please be respectful to everyone and their equipment as this is provided as a public service.</h3>
 </div>
-<div id='advert'>
+{% include 'include/matrix-info.html' %}
-  <p>We are still looking for testers or developers so, if you're interested and don't mind a work
+<h3>This is a public service. There are no logs stored only encrypted datasets. Please be respectful to everyone and their equipment as this is provided as a public service.</h3>
+<!--<div id='advert'>
+  <p>We are still looking for anyone willing to testers or developers so, if you're interested and don't mind a work
     in progress, then maybe you can help out by sending an email to submit at athnex dot com. Or better yet, message me on our
   <a href='https://github.com/hailey/sms-proj'>GitHub</a>. This is a side project of mine so development will be slow
   for as long as its only me. Thanks for your interest!</p>
-</div>
+</div>-->
 {% include 'include/footer.html' %}

templates/include/navblock.html

@@ -13,6 +13,7 @@
       {% endif %}
       <div class='navitemborder'></div>
       <div class='navitemsmall'>&#183; <a href='/about'>About</a></div>
+      <div class='navitemsmall'>&#183; <a href='/matrix'>Matrix Chat</a></div>
       <div class='navitemsmall'>&#183; <a href='/tos'>Terms of Service</a></div>
       <div class='navitemsmall'>&#183; <a href="/pp">Privacy Policy</a></div>
 

templates/matrix.html

@@ -0,0 +1,12 @@
+{% include 'include/header.html' %}
+<title>TheWords.faith Matrix Page</title>
+<script type="text/javascript">
+$("document").ready(function() {
+
+  });
+</script>
+</head>
+{% include 'include/navblock.html' %}
+<h1>TheWords.faith Matrix Page</h1>
+{% include 'include/matrix-info.html' %}
+{% include 'include/footer.html' %}