From d3491dc32e08de52b4f59a36f6d2e2ebf9cd9804 Mon Sep 17 00:00:00 2001
From: kjtdimuthu <kjtdimuthu@gmail.com>
Date: Mar 27 2016 16:15:35 +0000
Subject: [PATCH 1/3] CSS UI is updated in meeting widgets according to issue #22


---

diff --git a/hubs/widgets/templates/meetings.html b/hubs/widgets/templates/meetings.html
index 76a4c1b..f083080 100644
--- a/hubs/widgets/templates/meetings.html
+++ b/hubs/widgets/templates/meetings.html
@@ -1,23 +1,40 @@
 {% if meetings %}
-    {% for title, items in meetings.items() %}
-        {% set next = items | next_meeting %}
-        {% if next %}
-        <p>The {{ next.meeting_name }} is {{ next.human_time }}</p>
-        {% if next.display_duration %}
-        <h1 class='inline'>{{next.start_date}} - {{next.stop_date}}</h1>
-        {% else %}
-        <h1 class='inline'>{{next.start_date}}</h1>
-        {% endif %}
-        <div class='inline'>
-            {% if next.display_time %}
-            @{{next.start_time}}<br/>
+{% for title, items in meetings.items() %}
+{% set next = items | next_meeting %}
+{% if next %}
+<div>
+    <div class="row">
+        <h5>&nbsp;&nbsp;The {{ next.meeting_name }} is {{ next.human_time }}</h5>
+    </div>
+    <div class="row">
+        <div class="col-md-4">
+            {% if next.display_duration %}
+            <strong style="font-size: 18px">{{next.start_date}} - {{next.stop_date}}</strong>
+            {% else %}
+            <strong style="font-size: 18px">
+                {{next.start_date}}
+            </strong>
             {% endif %}
-            {{next.location}}<br/>
+        </div>
+        <div class="col-md-4" style="font-size: 12px">
+            {% if next.display_time %}
+            @{{next.start_time}}{% endif %}<br>
+
+            <a href="#">{{next.location}}</a>
+        </div>
+        <div class="col-md-4">
+            <button class="btn btn-default btn-sm" style="color: #a07cbc;font-size: 10px"><strong>Add to calendar</strong></button>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-12" style="font-size:14px">
             {{next.meeting_information_html}}
         </div>
-        {% endif %}
-        {% if meetings | length > 1 %}
-        <hr/>
-        {% endif %}
-    {% endfor %}
+    </div>
+</div>
+{% endif %}
+{% if meetings | length > 1 %}
+<hr>
+{% endif %}
+{% endfor %}
 {% endif %}

From 76075fdb06ef27a6477ab4a644aac35f1ef93e78 Mon Sep 17 00:00:00 2001
From: kjtdimuthu <kjtdimuthu@gmail.com>
Date: Mar 29 2016 02:52:14 +0000
Subject: [PATCH 2/3] Meeting widget CSS UI was modified according to #22. Meeting styles were added to style.css


---

diff --git a/hubs/static/css/style.css b/hubs/static/css/style.css
index 3ab7050..b0b9883 100644
--- a/hubs/static/css/style.css
+++ b/hubs/static/css/style.css
@@ -356,3 +356,22 @@ font-size: 32pt;
        url('/fonts/Comfortaa-700/Comfortaa-700.ttf') format('truetype'),
        url('/fonts/Comfortaa-700/Comfortaa-700.svg#Comfortaa') format('svg');
 }
+
+
+.meeting .meeting-date {
+    font-size: 18px;
+}
+
+.meeting .meeting-time {
+    font-size: 12px;
+}
+
+.meeting .meeting-info {
+    font-size: 14px;
+}
+
+.meeting .add-calendar {
+    font-size: 10px;
+    color: #a07cbc;
+}
+
diff --git a/hubs/widgets/templates/meetings.html b/hubs/widgets/templates/meetings.html
index f083080..f41af8b 100644
--- a/hubs/widgets/templates/meetings.html
+++ b/hubs/widgets/templates/meetings.html
@@ -2,32 +2,32 @@
 {% for title, items in meetings.items() %}
 {% set next = items | next_meeting %}
 {% if next %}
-<div>
+<div class="meeting">
     <div class="row">
         <h5>&nbsp;&nbsp;The {{ next.meeting_name }} is {{ next.human_time }}</h5>
     </div>
     <div class="row">
-        <div class="col-md-4">
+        <div class="col-md-4 meeting-date">
             {% if next.display_duration %}
-            <strong style="font-size: 18px">{{next.start_date}} - {{next.stop_date}}</strong>
+            <strong>{{next.start_date}} - {{next.stop_date}}</strong>
             {% else %}
-            <strong style="font-size: 18px">
+            <strong>
                 {{next.start_date}}
             </strong>
             {% endif %}
         </div>
-        <div class="col-md-4" style="font-size: 12px">
+        <div class="col-md-4 meeting-time">
             {% if next.display_time %}
             @{{next.start_time}}{% endif %}<br>
 
             <a href="#">{{next.location}}</a>
         </div>
         <div class="col-md-4">
-            <button class="btn btn-default btn-sm" style="color: #a07cbc;font-size: 10px"><strong>Add to calendar</strong></button>
+            <button class="btn btn-default btn-sm add-calendar"><strong>Add to calendar</strong></button>
         </div>
     </div>
     <div class="row">
-        <div class="col-md-12" style="font-size:14px">
+        <div class="col-md-12 meeting-info">
             {{next.meeting_information_html}}
         </div>
     </div>

From 3ce1455856b68b4906051412e4deef65c27edbf7 Mon Sep 17 00:00:00 2001
From: kjtdimuthu <kjtdimuthu@gmail.com>
Date: Mar 29 2016 04:30:21 +0000
Subject: [PATCH 3/3] issue #113 done


---

diff --git a/hubs/static/css/style.css b/hubs/static/css/style.css
index b0b9883..f29c893 100644
--- a/hubs/static/css/style.css
+++ b/hubs/static/css/style.css
@@ -168,6 +168,16 @@
     width: 100%;
     text-align: center;
   }
+  .header .dropdown.edit {
+    position: absolute;
+    width:150px;
+    top: 90px;
+    left: 0;
+    z-index: 2;
+  }
+  .header .edit-this-page{
+    color:#000000;
+  }
 }
 
     h1, h2, h3, h4, h5, h6 {
diff --git a/hubs/templates/hubs.html b/hubs/templates/hubs.html
index 2e4eaf5..a49087f 100644
--- a/hubs/templates/hubs.html
+++ b/hubs/templates/hubs.html
@@ -4,7 +4,6 @@
   <link href="{{ url_for('static', filename='bootstrap/css/bootstrap.css') }}" rel="stylesheet" />
   <link href="{{ url_for('static', filename='css/style.css') }}" rel="stylesheet" />
   <link href="{{ url_for('static', filename='css/pace-theme-minimal.css') }}" rel="stylesheet" />
-  <link href="{{ url_for('static', filename='css/pygments/monokai.css') }}" rel="stylesheet"/>
 </head>
 <script src="{{ url_for('static', filename='js/pace.min.js') }}"></script>
 <body>
@@ -75,8 +74,8 @@
 </div>
 <div class="header">
   {% if g.auth.logged_in and not edit and hub.is_admin(g.auth.user) %}
-    <div class="dropdown pull-right edit">
-      <span class="dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+    <div class="dropdown edit">
+      <span class="dropdown-toggle edit-this-page" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
         <span class="glyphicon glyphicon-edit"></span> edit this page
       </span>
       <ul class="dropdown-menu" aria-labelledby="dropdownMenu2">

