Some random rearranging stuff, see what looks good

6 files changed, 56 insertions, 101 deletions

diff --git a/blog/urls.py b/blog/urls.py
index 4ee3a159..93117009 100644
--- a/blog/urls.py
+++ b/blog/urls.py
@@ -5,9 +5,7 @@ from . import views
 app_name = 'blog'
 urlpatterns = [
     path('', views.home, name='home'),
-    path('my/', RedirectView.as_view(pattern_name='account', permanent=False)),
-    path('account/', RedirectView.as_view(pattern_name='account', permanent=False)),
-    path('my/account', views.account, name='account'),
+    path('account', views.account, name='account'),
     path('register/', views.register, name='register'),
     path('articles/post/<str:slug>', views.post, name='post'),
     path('articles/post/<str:slug>/comment', views.comment, name='comment'),
diff --git a/blog/views.py b/blog/views.py
index 04818531..403f30a4 100644
--- a/blog/views.py
+++ b/blog/views.py
@@ -43,16 +43,8 @@ def account(request):
         # Redirect to login page
         return redirect('blog:home')
 
-def homepage(request):
-    return render(request, 'blog/homepage.html', {'title': 'Homepage'})
-
 def register(request):
     user = request.user
-
-    # print request host
-    print(request.get_host())
-
-
     if user.is_authenticated:
         return redirect('blog:account')
     else:
@@ -65,7 +57,6 @@ def register(request):
                 form.save(request=request)
                 messages.success(request, 'Account was created! Please check your email to verify your account.', extra_tags='accountCreated')
                 return redirect('blog:register')
-                # return redirect('blog:home')
             else:
                 return render(request, 'blog/register.html', {'title': 'Register', 'form': form, 'captcha': captcha})
         else:
diff --git a/static/css/main.css b/static/css/main.css
index 5bc242c8..435046a6 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -112,29 +112,7 @@ input {
     margin: auto;
 }
 
-#navbar {
-    text-align: right;
-    margin-bottom: 20px;
-}
-
-#navbar ul {
-    margin: 0px;
-    padding: 0px;
-}
-
-#navbar li {
-    display: inline;
-    margin: 0px;
-    padding: 0px;
-    list-style-type: none;
-}
-
-#navbar a {
-    text-decoration: none;
-    color: white;
-}
-
-#navigation-area ul, #archives-area ul, #categories-area ul, #admin-area ul, #announcements ul {
+#navigation-area ul, #archives-area ul, #categories-area ul, #admin-area ul, #announcements ul, #user-area ul, #fun-stuff ul {
     margin: 0px;
     padding: 0px;
 }
@@ -144,23 +122,14 @@ input {
     list-style-type: none;
 }
 
-#navigation-area li, #archives-area li, #categories-area li, #admin-area li, #announcements li {
+#navigation-area li, #archives-area li, #categories-area li, #admin-area li, #announcements li, #user-area li, #fun-stuff li {
     display: block;
     margin: 0px;
     padding: 0px;
     list-style-type: none;
 }
 
-#navigation-area a, #archives-area a, #categories-area a, #admin-area a, #announcements a {
-    text-decoration: none;
-    color: #a591ee;
-}
-
-#navigation-area a:hover, #archives-area a:hover, #categories-area a:hover, #admin-area a:hover, #announcements a:hover {
-    text-decoration: underline;
-}
-
-#navigation-area img, #archives-area img, #categories-area img {
+#navigation-area img, #archives-area img, #categories-area img, #user-area img, #fun-stuff img {
     width: 24px;
     vertical-align:middle;
 }
@@ -170,7 +139,7 @@ input {
     vertical-align:middle;
 }
 
-#navigation-area span, #archives-area span, #categories-area span, #admin-area span, #announcements span {
+#navigation-area span, #archives-area span, #categories-area span, #admin-area span, #announcements span, #user-area span, #fun-stuff span {
     margin-right: 10px;
 }
 
diff --git a/templates/blog/home.html b/templates/blog/home.html
index 586b1a05..b91dcb77 100644
--- a/templates/blog/home.html
+++ b/templates/blog/home.html
@@ -62,12 +62,15 @@
         <em><a href="#">{{ post.author }}</a> in</em>
         <em><a href="#">{{ post.category }}</a></em>
       </p>
-      {% url 'ignis:post_image' post.id as cover_url %}
-      <p style="overflow:auto; text-align: justify; text-justify: inter-word; font-size: 13px; margin-bottom: 0px;">
-        <img src="{% url 'ignis:post_image' post.id %}.png" alt="Cover image for {{ post.title }}" style="float: left; margin-right: 10px; margin-bottom: 10px; width: 200px; height: auto;">
-        {{ post.excerpt | safe }}
+      <p style="text-align: justify; font-size: 13px; margin-bottom: 0px;">
+        <span>
+          <img src="{% url 'ignis:post_image' post.id %}.png" alt="Cover image for {{ post.title }}" style="float: left; margin-right: 10px; margin-bottom: 10px; width: 200px; height: auto;">
+        </span>
+        <span>
+          {{ post.excerpt | safe }}
+        </span>
       </p>
-      <div class="post-actions">
+      <div class="post-actions" style="clear: both;">
         <a href="{% url 'blog:post' post.slug %}">Continue Reading</a> | <a href="{% url 'blog:post' post.slug %}#comments">{{ post.num_comments }} Comments</a>
       </div>
     </div>
diff --git a/templates/blog/partials/base.html b/templates/blog/partials/base.html
index f1486758..11da5dd2 100644
--- a/templates/blog/partials/base.html
+++ b/templates/blog/partials/base.html
@@ -29,15 +29,6 @@
     <div id="wrap">
       <div id="header"></div>
       
-      <div id="navbar">
-        <ul>
-          {% if user.is_authenticated %}
-          <li><a class="button" href="{% url 'blog:account' %}">My Account</a></li>
-          <li><a class="button button-special" href="{% url 'users:logout' %}">Logout</a></li>
-          {% endif %}
-        </ul>
-      </div>
-      
       <div id="main-section">
         <div id="sidebar">
           {% include 'blog/partials/sidebar.html' %}
diff --git a/templates/blog/partials/sidebar.html b/templates/blog/partials/sidebar.html
index a371fd6b..dd235357 100644
--- a/templates/blog/partials/sidebar.html
+++ b/templates/blog/partials/sidebar.html
@@ -20,6 +20,13 @@
         <div>
             <input type="hidden" name="next" value="{{ request.path }}" style="display: none;">
             <input class="button button-special" type="submit" value="Login">
+            {% if not user.is_authenticated %}
+            <span style="margin-left: 10px; width: 90px;">
+                <a href="{% url 'blog:register' %}" class="button button" style="text-decoration: none;">
+                    New User?
+                </a>
+            </span>
+            {% endif %}
         </div>
     </form>
     {% for message in messages %}
@@ -45,41 +52,44 @@
         <input type="submit" align="center" class="button button-special" value="Search" style="width: 60px;">
     </form>
 </div>
-
-<div id="navigation-area" class="mtsbitem">
-    {% if user.is_authenticated %}
-        <h2>Hello, {{ user.username }}!</h2>
-    {% else %}
-        <h2>Navigation</h2>
-    {% endif %}
+{% if user.is_authenticated %}
+<div id="user-area" class="mtsbitem">
+    <h2>Hello, {{ user.username }}!</h2>
     <ul>
         <li>
             <span>
-                <img src="{% static 'images/site/icons/news.gif' %}" alt="Home" border="0">
+                <img src="{% static 'images/site/icons/mouse.gif' %}" alt="Home" border="0">
             </span>
             <span>
-                <a href="{% url 'blog:home' %}">
-                    Home
+                <a href="{% url 'blog:account' %}">
+                    My Account
                 </a>
             </span>
         </li>
         <li>
             <span>
-                <img src="{% static 'images/site/icons/book.gif' %}" alt="About" border="0">
+                <img src="{% static 'images/site/icons/key.gif' %}" alt="Home" border="0">
             </span>
             <span>
-                <a href="#">
-                    About
+                <a href="{% url 'users:logout' %}">
+                    Logout
                 </a>
             </span>
         </li>
+    </ul>
+</div>
+{% endif %}
+
+<div id="navigation-area" class="mtsbitem">
+    <h2>Links</h2>
+    <ul>
         <li>
             <span>
-                <img src="{% static 'images/site/icons/email.gif' %}" alt="Contact" border="0">
+                <img src="{% static 'images/site/icons/news.gif' %}" alt="Home" border="0">
             </span>
             <span>
-                <a href="#">
-                    Contact
+                <a href="{% url 'blog:home' %}">
+                    Home
                 </a>
             </span>
         </li>
@@ -89,23 +99,12 @@
             </span>
             <span>
                 <a href="#">
-                    Blog
+                    Articles
                 </a>
             </span>
         </li>
         <li>
             <span>
-                <img src="{% static 'images/site/icons/windows.gif' %}" alt="Repositories" border="0">
-            </span>
-            <span>
-                <a href="{% url 'dev_status:home' %}">
-                    Repositories
-                </a>
-            </span>
-        </li>
-        {% if user.is_authenticated %}
-        <li>
-            <span>
                 <img src="{% static 'images/site/icons/setup.gif' %}" alt="Source Code" border="0">
             </span>
             <span>
@@ -114,18 +113,6 @@
                 </a>
             </span>
         </li>
-        {% else %}
-        <li>
-            <span>
-                <img src="{% static 'images/site/icons/mouse.gif' %}" alt="Register" border="0">
-            </span>
-            <span>
-                <a href="{% url 'blog:register' %}">
-                    Register
-                </a>
-            </span>
-        </li>
-        {% endif %}
     </ul>
 </div>
 
@@ -250,3 +237,19 @@
     </ul>
 </div>
 {% endif %}
+
+<div id="fun-stuff" class="mtsbitem">
+    <h2>Fun Stuff</h2>
+    <ul>
+        <li>
+            <span>
+                <img src="{% static 'images/site/icons/windows.gif' %}" alt="Repositories" border="0">
+            </span>
+            <span>
+                <a href="{% url 'dev_status:home' %}">
+                    My Repositories
+                </a>
+            </span>
+        </li>
+    </ul>
+</div>