From 82a1d71570fa1dbc9b359032eca6834167fca629 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Oct 12 2017 16:28:18 +0000
Subject: [PATCH 1/3] Import the user_info template from pagure


Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/template/user_info.html b/template/user_info.html
new file mode 100644
index 0000000..4e97e7a
--- /dev/null
+++ b/template/user_info.html
@@ -0,0 +1,123 @@
+{% extends "master.html" %}
+
+{% block title %}User {{username}}{% endblock %}
+{% set tag = "users" %}
+{% from "_browseheader.html" import browse_header %}
+
+
+{% block header %}
+  <link href="{{ url_for('static', filename='vendor/selectize/selectize.bootstrap3.css') }}"
+  rel="stylesheet" />
+{% endblock %}
+
+
+{% from "_render_repo.html" import render_repos_as_card, render_activity_graph %}
+
+
+{% block content %}
+<div class="repo-header p-t-1">
+  <div class="container">
+    {{browse_header(select=tag)}}
+  </div>
+</div>
+<div class="p-t-2">
+  <div class="container">
+    <h2>
+        {{ user.default_email | avatar(36) | safe }} {{ username }}
+
+    </h2>
+    <p title="{{ user.created.strftime('%Y-%m-%d') }}">
+      Joined {{ user.created | humanize }}
+    </p>
+    <div class="row">
+      <div class="col-md-8">
+        {{ render_activity_graph(username) }}
+        {{ 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) }}
+      </div>
+      <div class="col-md-4">
+        <div class="card" id="group_list">
+            <div class="card-header">
+                Groups <span class="label label-default">{{ user.groups | length }}</span>
+            </div>
+            {% for group in user.groups %}
+              <div class="list-group">
+                <a class="list-group-item" href="{{ url_for(
+                    'view_group', group=group)}}">
+                  <div class=""><strong><span class="oi" data-glyph="people">
+                    </span> &nbsp;{{ group }}</strong>
+                  </div>
+                </a>
+              </div>
+            {% else %}
+            <div class="card-block">
+              <p>No group found</p>
+            </div>
+            {% endfor %}
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+{% endblock %}
+
+{% block jscripts %}
+    {{ super() }}
+    <script type="text/javascript">
+      $(function(){
+        $('.show_parts input[type="checkbox"]').change(function(){
+          $('#' + $(this).attr('name')).toggle();
+        });
+      });
+    </script>
+<script src="{{ url_for('static', filename='vendor/selectize/selectize.min.js') }}" type="text/javascript"> </script>
+<script type="text/javascript">
+$(document).ready(function() {
+  $('#headerSearch').on('keypress keydown keyup', function(e) {
+    if (e.which == 13) {
+        e.preventDefault();
+        return false;
+    }
+  });
+  $('#term').selectize({
+    valueField: 'user',
+    labelField: 'user',
+    searchField: 'user',
+    onType: function(value){
+      if (value == ""){
+      this.close();
+      }
+    },
+    onChange: function(value){
+      if (value != ""){
+        $('#headerSearch').submit();
+      }
+    },
+    maxItems: 1,
+    create: false,
+    load: function(query, callback) {
+      if (!query.length) return callback();
+      $.getJSON(
+        "{{ url_for('api_ns.api_users') }}", {
+          pattern: query
+        },
+        function( data ) {
+          callback( data.users.map(function(x) { return { user: x }; }) );
+        }
+      );
+    },
+    render: {
+      option: function(item, escape) {
+        return '<div>' +
+          '<div class="projecticon-search pull-xs-left"><span class="oi" data-glyph="person"></span></div>'+
+          '<div class="title">' +
+            '<span class="name"><strong>' + escape(item.user) + '</strong></span>' +
+          '</div>' +
+          '<div class="description"><small>' + escape(item.user) + '</small></div>' +
+        '</div>';
+      }
+    },
+  });
+});
+</script>
+{% endblock %}

From 7ec449287242a14d5b4e7afe6f2d434b40ec9552 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Oct 12 2017 16:29:07 +0000
Subject: [PATCH 2/3] Add a link to the user's FAS page as well as a badge when they are on vacations


Fixes https://pagure.io/pagure/issue/2376

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/template/user_info.html b/template/user_info.html
index 4e97e7a..c8e0820 100644
--- a/template/user_info.html
+++ b/template/user_info.html
@@ -24,10 +24,12 @@
   <div class="container">
     <h2>
         {{ user.default_email | avatar(36) | safe }} {{ username }}
-
     </h2>
     <p title="{{ user.created.strftime('%Y-%m-%d') }}">
-      Joined {{ user.created | humanize }}
+      Joined {{ user.created | humanize }} {% if config['FAS_URL']
+        %}(<a href="{{ config['FAS_URL'].rstrip('/') }}/user/view/{{ username }}">fas</a>){%
+        endif %}
+      <img src="https://apps.fedoraproject.org/calendar/api/{{ username }}/shield/vacation?connector=on&always=0" alt="" />
     </p>
     <div class="row">
       <div class="col-md-8">

From df2164aa8e5ce4f5bacaf9cf8ecf2cc85ef9f82c Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Oct 13 2017 08:50:33 +0000
Subject: [PATCH 3/3] Code style fixes


Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/template/user_info.html b/template/user_info.html
index c8e0820..ea32c77 100644
--- a/template/user_info.html
+++ b/template/user_info.html
@@ -1,6 +1,6 @@
 {% extends "master.html" %}
 
-{% block title %}User {{username}}{% endblock %}
+{% block title %}User {{ user.html_title }}{% endblock %}
 {% set tag = "users" %}
 {% from "_browseheader.html" import browse_header %}
 
@@ -35,7 +35,7 @@
       <div class="col-md-8">
         {{ render_activity_graph(username) }}
         {{ 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_repos_as_card(forks, forks_length, 'Forks', 'forkpage', forkpage, total_page_forks) }}
       </div>
       <div class="col-md-4">
         <div class="card" id="group_list">
@@ -85,13 +85,13 @@ $(document).ready(function() {
     valueField: 'user',
     labelField: 'user',
     searchField: 'user',
-    onType: function(value){
-      if (value == ""){
-      this.close();
+    onType: function(value) {
+      if (value == "") {
+        this.close();
       }
     },
-    onChange: function(value){
-      if (value != ""){
+    onChange: function(value) {
+      if (value != "") {
         $('#headerSearch').submit();
       }
     },
@@ -111,7 +111,7 @@ $(document).ready(function() {
     render: {
       option: function(item, escape) {
         return '<div>' +
-          '<div class="projecticon-search pull-xs-left"><span class="oi" data-glyph="person"></span></div>'+
+          '<div class="projecticon-search pull-xs-left"><span class="oi" data-glyph="person"></span></div>' +
           '<div class="title">' +
             '<span class="name"><strong>' + escape(item.user) + '</strong></span>' +
           '</div>' +