From 454c5d62fc9d65d24a8982c589258fcf15ccea77 Mon Sep 17 00:00:00 2001
From: Jakub Kadlcik <frostyx@email.cz>
Date: Nov 28 2017 16:31:23 +0000
Subject: [frontend] move the blog window to the panel on right


---

diff --git a/frontend/coprs_frontend/coprs/static/js/blog.js b/frontend/coprs_frontend/coprs/static/js/blog.js
index cf5db5b..5113c64 100644
--- a/frontend/coprs_frontend/coprs/static/js/blog.js
+++ b/frontend/coprs_frontend/coprs/static/js/blog.js
@@ -19,8 +19,9 @@ $(document).ready(function(){
 
             $("#blog-title").text(el.find("title").text())
             $("#blog-author").text(el.find("author").text())
-            $("#blog-link").attr("href", el.find("link").text())
             $("#blog-date").text(f_published)
+            $("#blog-link").attr("href", el.find("link").text())
+            $("#blog-link").removeClass("hidden")
             return false
         });
     });
diff --git a/frontend/coprs_frontend/coprs/templates/_helpers.html b/frontend/coprs_frontend/coprs/templates/_helpers.html
index 49007fb..ae42750 100644
--- a/frontend/coprs_frontend/coprs/templates/_helpers.html
+++ b/frontend/coprs_frontend/coprs/templates/_helpers.html
@@ -313,6 +313,36 @@
 {% endmacro %}
 
 
+{% macro recent_blog_panel() %}
+  <div class="panel panel-default">
+    <div class="panel-heading">
+      <h3 class="panel-title">News - <a href="https://fedora-copr.github.io/">Read All</a></h3>
+    </div>
+    <div class="list-group">
+      <noscript>
+        <a href="https://fedora-copr.github.io/" class="list-group-item">
+          <p class="list-group-item-text">
+            This page uses JavaScript to show the most recent article from out blog.
+            Click here to visit the blog.
+          </p>
+        </a>
+      </noscript>
+      <a href="" id="blog-link" class="list-group-item hidden">
+        <b class="list-group-item-heading" id="blog-title"></b>
+        <p class="list-group-item-text">
+          <small>Published:</small>
+          <span id="blog-date"></span>
+        </p>
+        <p class="list-group-item-text">
+          <small>Author:</small>
+          <span id="blog-author"></span>
+        </p>
+      </a>
+    </div>
+  </div>
+{% endmacro %}
+
+
 {% macro render_crumb(href, title, active=False) %}
 <li {% if active %} class="active" {% endif %} >
   <a href="{{ href }}">
diff --git a/frontend/coprs_frontend/coprs/templates/coprs/show.html b/frontend/coprs_frontend/coprs/templates/coprs/show.html
index 7af98c6..efface3 100644
--- a/frontend/coprs_frontend/coprs/templates/coprs/show.html
+++ b/frontend/coprs_frontend/coprs/templates/coprs/show.html
@@ -2,7 +2,7 @@
 {% block title %}Project List{% endblock %}
 {% block header %}Project List{% endblock %}
 {% from "_helpers.html" import render_pagination, copr_details_href, copr_name, user_projects_panel %}
-{% from "_helpers.html" import recent_builds_panel, task_queue_panel %}
+{% from "_helpers.html" import recent_builds_panel, task_queue_panel, recent_blog_panel %}
 {%block main_menu_projects %}active{% endblock %}
 {% block body %}
 <div class="row">
@@ -46,6 +46,7 @@
       {{ user_projects_panel(g.user) }}
     {% endif %}
 
+    {{ recent_blog_panel() }}
     {{ task_queue_panel(tasks_info) }}
     {{ recent_builds_panel(users_builds) }}
 
diff --git a/frontend/coprs_frontend/coprs/templates/coprs/show/all.html b/frontend/coprs_frontend/coprs/templates/coprs/show/all.html
index 3e1f4cc..be8624a 100644
--- a/frontend/coprs_frontend/coprs/templates/coprs/show/all.html
+++ b/frontend/coprs_frontend/coprs/templates/coprs/show/all.html
@@ -12,30 +12,6 @@
 </div>
 {% endif %}
 
-<a href="https://fedora-copr.github.io/" class="btn button-new pull-right btn-primary">
-  <i class="fa fa-file-text-o" aria-hidden="true"></i> Read all
-</a>
-
-<h2>News</h2>
-<div class="row">
-  <div class="col-md-12">
-    <noscript><p>This page uses JavaScript to show most recent article from out blog</p></noscript>
-    <div class="panel panel-default">
-      <div class="list-group">
-        <div id="blog">
-          <a href="" id="blog-link" class="list-group-item">
-            <h3 class="list-group-item-heading" id="blog-title"></h3>
-            <span class="list-group-item-text">
-              <span id="blog-date"></span> | <span id="blog-author"></span>
-              <br>Read the most recent article on our blog.
-            </span>
-          </a>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
 {% if g.user %}
 <a href="{{url_for('coprs_ns.copr_add', username=g.user.name) }}" class="btn button-new pull-right btn-primary">
   <span class="pficon pficon-add-circle-o"></span> New Project