From 60ffc0e14910ffa7a805126740fcacbfdd37bfd2 Mon Sep 17 00:00:00 2001
From: Ryan Lerch <rlerch@redhat.com>
Date: Feb 19 2018 03:18:59 +0000
Subject: [PATCH 1/5] make meetings no config warning show when owner


This makes the no-config warning for the meetings
widget only show when the owner is looking at the hub.
otherwise, just a no meetings message is shown.

---

diff --git a/hubs/static/css/style.css b/hubs/static/css/style.css
index 38a1486..68f2542 100644
--- a/hubs/static/css/style.css
+++ b/hubs/static/css/style.css
@@ -374,6 +374,8 @@ header h5.m-b-1 {
 .text-fedora-green-dark{color: #488b18!important;}
 .text-fedora-purple-dark{color: #70488f!important;}
 
+.text-muted-muted{color: #ddd!important;}
+
 .typeahead, .twitter-typeahead {
   width: 100%!important;
 }
diff --git a/hubs/widgets/meetings/templates/root.html b/hubs/widgets/meetings/templates/root.html
index 9c2cfa7..65ed02f 100644
--- a/hubs/widgets/meetings/templates/root.html
+++ b/hubs/widgets/meetings/templates/root.html
@@ -1,14 +1,24 @@
 {% if not calendars %}
   {% if hub_type == 'team' %}
-  <p class="text-warning mb-0">
-    <em>You must configure a calendar in the hub configuration in order to use this widget.</em>
-  </p>
+  {% if widget_instance.hub.allows(g.user, "config") %}
+  <div class="text-center text-muted py-2">
+    <div class="text-warning">
+      <i class="fa fa-warning fa-3x"></i>
+    </div>
+    <div>
+        <strong>no meeting calendar configured</strong><br/>
+        <small>Set up a meeting calendar in this Hub's Configuration.</small>
+    </div>
+  </div>
+  {% else %}
+  <div class="text-center text-muted">
+    no upcoming meetings
+  </div>
+  {% endif %}
   {% elif hub_type == 'stream'%}
     {% if no_subscriptions %}
       <div class="text-center text-muted">
-        You aren't subscribed to any hubs.
-      </div>
-      <div class="text-center text-muted">
+        <strong>You aren't subscribed to any hubs.</strong>
         Subscribe to a hub to show meetings here.
       </div>
     {% else%}

From 180b5692eccb4a9ff1d674cd4e4be862d1b7f973 Mon Sep 17 00:00:00 2001
From: Ryan Lerch <rlerch@redhat.com>
Date: Feb 19 2018 03:19:38 +0000
Subject: [PATCH 2/5] add warning for team owner if no repos are configured on repos widget


fixes #581

---

diff --git a/hubs/widgets/repositories/templates/root.html b/hubs/widgets/repositories/templates/root.html
index 0a81e9a..4371bc4 100644
--- a/hubs/widgets/repositories/templates/root.html
+++ b/hubs/widgets/repositories/templates/root.html
@@ -1,12 +1,30 @@
-<table>
-{% for repo in repos %}
-  <tr>
-    <td class="repo-name"><strong><a href='{{repo["repo_url"]}}'>{{repo["repo_name"]}}</a></strong></td>
-    <td class="issues-count pr-2"><i class="fa fa-bug mr-1"></i>{{repo["issues_count"]}}</td>
-    <td class="pr-count"><i class="fa fa-code-fork mr-1"></i>{{repo["pr_count"]}}</td>
-  </tr>
-{% endfor %}
-</table>
+{% if repos %}
+  <table>
+  {% for repo in repos %}
+    <tr>
+      <td class="repo-name"><strong><a href='{{repo["repo_url"]}}'>{{repo["repo_name"]}}</a></strong></td>
+      <td class="issues-count pr-2"><i class="fa fa-bug mr-1"></i>{{repo["issues_count"]}}</td>
+      <td class="pr-count"><i class="fa fa-code-fork mr-1"></i>{{repo["pr_count"]}}</td>
+    </tr>
+  {% endfor %}
+  </table>
+{% else %}
+  {% if widget_instance.hub.allows(g.user, "config") %}
+  <div class="text-center text-muted py-2">
+    <div class="text-warning">
+      <i class="fa fa-warning fa-3x"></i>
+    </div>
+    <div>
+        <strong>no repositories configured</strong><br/>
+        <small>Set up repositories in the Software Development Platforms section in this Hub's Configuration.</small>
+    </div>
+  </div>
+  {% else %}
+  <div class="text-center text-muted">
+    no repositories
+  </div>
+  {% endif %}
+{% endif %}
     
 <style>
 .widget-repositories td.repo-name{

From 2b21cf65b87482c4f79279f28cac9ffd4e7190dc Mon Sep 17 00:00:00 2001
From: Ryan Lerch <rlerch@redhat.com>
Date: Feb 19 2018 03:20:20 +0000
Subject: [PATCH 3/5] add message if user is owner of group, and no repos are defined


---

diff --git a/hubs/widgets/pullrequests/templates/root.html b/hubs/widgets/pullrequests/templates/root.html
index e81e860..3dc36f9 100644
--- a/hubs/widgets/pullrequests/templates/root.html
+++ b/hubs/widgets/pullrequests/templates/root.html
@@ -1,10 +1,16 @@
-{% if no_repos_defined %}
-<p class="text-warning mb-0">
-  <em>You must configure a software development platform in the hub configuration in order to use this widget.</em>
-</p>
+{% if no_repos_defined and widget_instance.hub.allows(g.user, "config") %}
+  <div class="text-center text-muted py-2">
+    <div class="text-warning">
+      <i class="fa fa-warning fa-3x"></i>
+    </div>
+    <div>
+        <strong>no pull request sources configured</strong><br/>
+        <small>Configure Software Development Platforms in this Hub's Configuration.</small>
+    </div>
+  </div>
 {% else %}
   {% if not all_pr %}
-  <div class="text-muted text-center">No active pull requests</div>
+  <div class="text-muted text-center">no active pull requests</div>
   {% else %}
   <ul class="list-unstyled">
     {% for pr in all_pr[:10] %}

From 5eb587f4a68a5eb97f8e143379358b405f901f4e Mon Sep 17 00:00:00 2001
From: Ryan Lerch <rlerch@redhat.com>
Date: Feb 19 2018 03:20:53 +0000
Subject: [PATCH 4/5] add messages for newest open issues widget if empty


adds messages for if no repos are configured, or no results
are found.

fixes #580

---

diff --git a/hubs/widgets/newestissues/__init__.py b/hubs/widgets/newestissues/__init__.py
index 99ec123..eab5a53 100644
--- a/hubs/widgets/newestissues/__init__.py
+++ b/hubs/widgets/newestissues/__init__.py
@@ -21,6 +21,9 @@ class NewestIssues(Widget):
 class BaseView(RootWidgetView):
 
     def get_context(self, instance, *args, **kwargs):
+        if (not instance.hub.config["pagure"] and
+           not instance.hub.config["github"]):
+            return dict(no_repos_defined=True)
         get_pagure_issues = GetPagureIssues(instance)
         get_github_issues = GetGithubIssues(instance)
 
diff --git a/hubs/widgets/newestissues/templates/root.html b/hubs/widgets/newestissues/templates/root.html
index 18b53eb..2a1fce7 100644
--- a/hubs/widgets/newestissues/templates/root.html
+++ b/hubs/widgets/newestissues/templates/root.html
@@ -1,28 +1,44 @@
-<ul class="list-unstyled">
-    {% for issue in all_issues[:10] %}
-      <li class="media py-2">
-        <div class="media-body">
-          <div>
-              <a  href="{{ issue['issue_url'] }}"
-              target="_blank">
-                <span class="badge badge-secondary">#{{ issue['issue_id'] }}</span>
-                <span title="{{ issue['issue_title_full'] }}">
-                    {{ issue['issue_title'] }} {% if
-                      issue['issue_title_full'] | length > 40 %} ... {% endif %}
-                  </span>
-            </a>
-            
-  
-          </div>
-          <small>
-            Opened {{issue['issue_opened_date']|humanize}} in 
-            <a href="{{ issue['issue_project_url'] }}"
-                target="_blank"
-                title="the {{ issue['issue_project_name'] }} repo">
-            {{ issue['issue_project_name'] }}
-            </a> by {{ issue['issue_openedby'] }}
-          </small>
-        </div>
-      </li>
-    {% endfor %}
-  </ul>
\ No newline at end of file
+{% if no_repos_defined and widget_instance.hub.allows(g.user, "config") %}
+  <div class="text-center text-muted py-2">
+    <div class="text-warning">
+      <i class="fa fa-warning fa-3x"></i>
+    </div>
+    <div>
+        <strong>no issues sources configured</strong><br/>
+        <small>Configure Software Development Platforms in this Hub's Configuration.</small>
+    </div>
+  </div>
+{% else %}
+  {% if not all_issues %}
+  <div class="text-muted text-center">no open issues</div>
+  {% else %}
+    <ul class="list-unstyled">
+        {% for issue in all_issues[:10] %}
+          <li class="media py-2">
+            <div class="media-body">
+              <div>
+                  <a  href="{{ issue['issue_url'] }}"
+                  target="_blank">
+                    <span class="badge badge-secondary">#{{ issue['issue_id'] }}</span>
+                    <span title="{{ issue['issue_title_full'] }}">
+                        {{ issue['issue_title'] }} {% if
+                          issue['issue_title_full'] | length > 40 %} ... {% endif %}
+                      </span>
+                </a>
+                
+      
+              </div>
+              <small>
+                Opened {{issue['issue_opened_date']|humanize}} in 
+                <a href="{{ issue['issue_project_url'] }}"
+                    target="_blank"
+                    title="the {{ issue['issue_project_name'] }} repo">
+                {{ issue['issue_project_name'] }}
+                </a> by {{ issue['issue_openedby'] }}
+              </small>
+            </div>
+          </li>
+        {% endfor %}
+      </ul>
+  {% endif %}
+{% endif %}
\ No newline at end of file

From aeddb85605c66d5efa7b12752c1b440933886e4a Mon Sep 17 00:00:00 2001
From: Ryan Lerch <rlerch@redhat.com>
Date: Feb 19 2018 03:20:55 +0000
Subject: [PATCH 5/5] fix issues widget error messages


show different messages if you are the hub owner, and
style it up like the others i just added.

---

diff --git a/hubs/widgets/issues/views.py b/hubs/widgets/issues/views.py
index a7d2d5c..4580936 100644
--- a/hubs/widgets/issues/views.py
+++ b/hubs/widgets/issues/views.py
@@ -1,4 +1,5 @@
 import arrow
+import flask
 
 from hubs.widgets.view import WidgetView
 from hubs.models.hub import Hub
@@ -25,11 +26,18 @@ class DataView(WidgetView):
         pagure_username = watched_hub.config.get('pagure_username')
 
         if not (bugzilla_email or github_username or pagure_username):
-            return dict(
-                status="ERROR",
-                message="You must configure VCS details in the hub "
-                        "configuration in order to use this widget."
-            )
+            if (instance.hub.allows(flask.g.user, "config")):
+                return dict(
+                    status="ERROR",
+                    message="You must configure software development "
+                            "platform sources in the Version Control panel "
+                            "in your My Hub configuration for this widget to work"
+                )
+            else:
+                return dict(
+                    status="OK",
+                    data={'issues': [], 'counts': {}}
+                )
 
         [bugzilla, bzcnt] = GetBugzillaBugs(instance)()
         [pagure, pcnt] = GetPagureIssues(instance)()
diff --git a/js/app/widgets/issues/Widget.js b/js/app/widgets/issues/Widget.js
index 63e5448..674a518 100644
--- a/js/app/widgets/issues/Widget.js
+++ b/js/app/widgets/issues/Widget.js
@@ -66,16 +66,19 @@ export default class IssuesWidget extends React.Component {
     }
     else if (this.state.error) {
       content = (
-        <div className="alert alert-warning m-2">
-          {this.state.error}
+        <div className="text-center text-muted p-3">
+          <div className="text-warning">
+            <i className="fa fa-warning fa-3x"></i>
+          </div>
+          <div>
+            <small>{this.state.error}</small>
+          </div>
         </div>
       )
     }
     else if (this.state.issues.length === 0) {
       content = (
-        <div className="alert alert-secondary m-2">
-          There are no open issues
-        </div>
+        <div className="text-muted text-center p-3">no open issues</div>
       )
     }
     else {