From bda15ff720e94e6918e3ae6d526d6dae555f6ff8 Mon Sep 17 00:00:00 2001
From: Ryan Lerch <rlerch@redhat.com>
Date: Jan 19 2016 09:30:39 +0000
Subject: updated the stlying for the contributions graph


added teh graph to a card to match the other items on the page
Also moved the code that renders this card into a macro, as it
is displayed on a user's dashboard, as well as the profile page
for a user.

---

diff --git a/pagure/templates/_render_repo.html b/pagure/templates/_render_repo.html
index 91ff11e..78ee52f 100644
--- a/pagure/templates/_render_repo.html
+++ b/pagure/templates/_render_repo.html
@@ -200,3 +200,18 @@
         {{ pagination_link(pagetitle, page, total_page) }}
         {% endif %}
 {% endmacro %}
+
+{% macro render_contributions_graph(username) %}
+  {% if config.get('DATAGREPPER_URL') %}
+  <div class="card" id="group_list">
+    <div class="card-header">
+      Contributions <a href="{{config.get('DATAGREPPER_URL')}}/raw?category={{config.get('DATAGREPPER_CATEGORY', 'pagure')}}&user={{username}}" class="btn btn-secondary btn-sm pull-xs-right">View List</a>
+    </div>
+    <div class="card-block p-a-0">
+      <a href="{{config.get('DATAGREPPER_URL')}}/charts/line?category={{config.get('DATAGREPPER_CATEGORY', 'pagure')}}&user={{username}}&split_on=users&delta=31536000&N=12&title=&show_y_labels=False&width=700&height=200&style=light_solarized" target="_blank">
+        <img src="{{config.get('DATAGREPPER_URL')}}/charts/line?category={{config.get('DATAGREPPER_CATEGORY', 'pagure')}}&user={{username}}&split_on=users&delta=31536000&N=12&title=&show_y_labels=False&width=400&height=200&style=light_solarized" alt="User activity graph"/>
+      </a>
+    </div>
+  </div>
+  {% endif %}
+{% endmacro%}
diff --git a/pagure/templates/index_auth.html b/pagure/templates/index_auth.html
index 5e6cb04..7f20b83 100644
--- a/pagure/templates/index_auth.html
+++ b/pagure/templates/index_auth.html
@@ -11,7 +11,7 @@
 {% endblock %}
 
 
-{% from "_render_repo.html" import render_repos_as_card %}
+{% from "_render_repo.html" import render_repos_as_card, render_contributions_graph %}
 
 {% block content %}
 <div class="p-t-2">
@@ -159,6 +159,9 @@
           </div>
         {% endif %}
         </div>
+
+        {{render_contributions_graph(username)}}
+
       </div>
       <div class="col-md-4">
         <div class="card" id="group_list">
@@ -180,16 +183,6 @@
         </div>
       </div>
     </div>
-    {% if config.get('DATAGREPPER_URL') %}
-    <section class="project_list" id="user_graph">
-        <header>
-            <h2>Contributions</h2>
-        </header>
-        <a href="{{config.get('DATAGREPPER_URL')}}/raw?category={{config.get('DATAGREPPER_CATEGORY', 'pagure')}}&user={{username}}" target="_blank">
-          <img src="{{config.get('DATAGREPPER_URL')}}/charts/line?category={{config.get('DATAGREPPER_CATEGORY', 'pagure')}}&user={{username}}&split_on=users&delta=31536000&N=12&title=&width=600&height=200&style=light&fill=True" alt="User activity graph"/>
-        </a>
-    </section>
-    {% endif %}
   </div>
 </div>
 {% endblock %}
diff --git a/pagure/templates/user_info.html b/pagure/templates/user_info.html
index cc9f402..6b49bf1 100644
--- a/pagure/templates/user_info.html
+++ b/pagure/templates/user_info.html
@@ -11,7 +11,7 @@
 {% endblock %}
 
 
-{% from "_render_repo.html" import render_repos_as_card %}
+{% from "_render_repo.html" import render_repos_as_card, render_contributions_graph %}
 
 
 {% block content %}
@@ -33,6 +33,7 @@
       <div class="col-md-8">
         {{ render_repos_as_card(repos, repos_length, 'Projects', 'repopage', repopage, total_page_repos) }}
         {{ render_repos_as_card(forks, forks_length,'Forks', 'forkpage', forkpage, total_page_forks) }}
+        {{render_contributions_graph(username)}}
       </div>
       <div class="col-md-4">
         <div class="card" id="group_list">
@@ -56,16 +57,6 @@
         </div>
       </div>
     </div>
-    {% if config.get('DATAGREPPER_URL') %}
-    <section class="project_list" id="user_graph">
-        <header>
-            <h2>Contributions</h2>
-        </header>
-        <a href="{{config.get('DATAGREPPER_URL')}}/raw?category={{config.get('DATAGREPPER_CATEGORY', 'pagure')}}&user={{username}}" target="_blank">
-          <img src="{{config.get('DATAGREPPER_URL')}}/charts/line?category={{config.get('DATAGREPPER_CATEGORY', 'pagure')}}&user={{username}}&split_on=users&delta=31536000&N=12&title=&width=600&height=200&style=light&fill=True" alt="User activity graph"/>
-        </a>
-    </section>
-    {% endif %}
   </div>
 </div>
 {% endblock %}