Merged in changes.

csdl · Apr 13, 2012 · d35bf0d · d35bf0d
2 parents e4c4594 + cfbff96
commit d35bf0d
Show file tree

Hide file tree

Showing 36 changed files with 520 additions and 152 deletions.
diff --git a/bootstrap-cam/css/main.css → caminator/css/main.css b/bootstrap-cam/css/main.css → caminator/css/main.css
diff --git a/bootstrap-cam/images/ipad-landscape.png → caminator/images/ipad-landscape.png b/bootstrap-cam/images/ipad-landscape.png → caminator/images/ipad-landscape.png
diff --git a/bootstrap-cam/images/ipad-portrait.png → caminator/images/ipad-portrait.png b/bootstrap-cam/images/ipad-portrait.png → caminator/images/ipad-portrait.png
diff --git a/bootstrap-cam/images/iphone-landscape.png → caminator/images/iphone-landscape.png b/bootstrap-cam/images/iphone-landscape.png → caminator/images/iphone-landscape.png
diff --git a/bootstrap-cam/images/iphone-portrait.png → caminator/images/iphone-portrait.png b/bootstrap-cam/images/iphone-portrait.png → caminator/images/iphone-portrait.png
diff --git a/bootstrap-cam/images/kindle-landscape.png → caminator/images/kindle-landscape.png b/bootstrap-cam/images/kindle-landscape.png → caminator/images/kindle-landscape.png
diff --git a/bootstrap-cam/images/kindle-portrait.png → caminator/images/kindle-portrait.png b/bootstrap-cam/images/kindle-portrait.png → caminator/images/kindle-portrait.png
diff --git a/bootstrap-cam/iphone-ipad.html → caminator/iphone-ipad.html b/bootstrap-cam/iphone-ipad.html → caminator/iphone-ipad.html
@@ -1,6 +1,10 @@
 <!doctype html>
 <html lang="en-us">
 <head>
+<!-- 
+    Borrowed from http://www.responsinator.com/ written by @andyhovey
+    and @tamapugsley.  Modified to test Makahiki2.
+-->
 <meta charset="utf-8">
 <title>Test Sizes</title>
 <link rel="stylesheet" media="screen" href="css/main.css">

diff --git a/makahiki/apps/pages/templates/energy.html b/makahiki/apps/pages/templates/energy.html
@@ -14,10 +14,10 @@
 {% endblock %}
 
 {% block body %}
-    <div {% get_id_and_classes "energy-body" "responsive" %}>
-        <div {% get_id_and_classes "base-row" "responsive" %}>
+    <div class="container-fluid">
+        <div class="row-fluid">
             <!-- left column -->
-            <div {% get_id_and_classes "narrow-col" "responsive" %}>
+            <div class="span5">
                 <div id='energy_power_meter'>
                     {% include "widgets/energy_power_meter/templates/index.html" %}
                 </div>
@@ -26,7 +26,7 @@
                 </div>
             </div>
             <!-- right column -->
-            <div {% get_id_and_classes "wide-col" "responsive" %}>
+            <div class="span7">
                 <div id='energy_goal'>
                     {% include "widgets/energy_goal/templates/index.html" %}
                 </div>

diff --git a/makahiki/apps/pages/templates/help.html b/makahiki/apps/pages/templates/help.html
@@ -13,10 +13,10 @@
 {% endblock %}
 
 {% block body %}
-    <div {% get_id_and_classes "help-body" "responsive" %}>
-        <div {% get_id_and_classes "base-row" "responsive" %}>
+    <div class="container-fluid">
+        <div class="row-fluid">
             <!-- left column -->
-            <div {% get_id_and_classes "even-col" "responsive" %}>
+            <div class="span6">
                 <div id='help_intro'>
                     {% include "widgets/help/intro/templates/index.html" %}
                 </div>
@@ -25,7 +25,7 @@
                 </div>
             </div>
             <!-- right column -->
-            <div {% get_id_and_classes "even-col" "responsive" %}>
+            <div class="span6">
                 <div id='help_rule'>
                     {% include "widgets/help/rule/templates/index.html" %}
                 </div>

diff --git a/makahiki/apps/pages/templates/home.html b/makahiki/apps/pages/templates/home.html
@@ -13,7 +13,9 @@
 {% endblock %}
 
 {% block body %}
-    <div id="home" class="container-fluid">
+<div class="content">
+    <div id="home" class="container">
         {% include "widgets/home/templates/index.html" %}
     </div>
+</div>    
 {% endblock %}
diff --git a/makahiki/apps/pages/templates/learn.html b/makahiki/apps/pages/templates/learn.html
@@ -13,10 +13,10 @@
 {% endblock %}
 
 {% block body %}
-    <div {% get_id_and_classes "activity-body" "responsive" %}>
-        <div {% get_id_and_classes "base-row" "responsive" %}>
+    <div class="container-fluid">
+        <div class="row-fluid">
             <!-- left column -->
-            <div {% get_id_and_classes "narrow-col" "responsive" %}>
+            <div class="span5">
                 <div id='upcoming_events'>
                     {% include "widgets/upcoming_events/templates/index.html" %}
                 </div>
@@ -25,7 +25,7 @@
                 </div>
             </div>
             <!-- right column -->
-            <div {% get_id_and_classes "wide-col" "responsive" %}>
+            <div class="span7">
                 <div id='smartgrid'>
                     {% include "widgets/smartgrid/templates/index.html" %}
                 </div>

diff --git a/makahiki/apps/pages/templates/news.html b/makahiki/apps/pages/templates/news.html
@@ -13,10 +13,10 @@
 {% endblock %}
 
 {% block body %}
-    <div {% get_id_and_classes "news-body" "responsive" %}>
-        <div {% get_id_and_classes "base-row" "responsive" %}>
+    <div class="container-fluid">
+        <div class="row-fluid">
             <!-- left column -->
-            <div {% get_id_and_classes "even-col" "responsive" %}>
+            <div class="span6">
                 <div id='team_members'>
                     {% include "widgets/team_members/templates/index.html" %}
                 </div>
@@ -25,7 +25,7 @@
                 </div>
             </div>
             <!-- right column -->
-            <div {% get_id_and_classes "even-col" "responsive" %}>
+            <div class="span6">
                 <div id='upcomping_events'>
                     {% include "widgets/upcoming_events/templates/index.html" %}
                 </div>

diff --git a/makahiki/apps/pages/templates/profile.html b/makahiki/apps/pages/templates/profile.html
@@ -21,15 +21,16 @@
                 <!-- My Info -->
                 <div class="content-box">
                     {% include "widgets/my_info/templates/index.html" %}
-                </div>
+                </div> 
+            </div>
+
+            <!-- right column -->
+            <div class="span6">
 
                 <!-- My Badges -->
                 <div class="content-box">
                     {% include "widgets/badges/templates/index.html" %}
                 </div>
-            </div>
-            <!-- right column -->
-            <div class="span6">
 
                 <!-- My Public Commitment-->
                 <div class="content-box">

diff --git a/makahiki/apps/widgets/badges/templates/badge-catalog.html b/makahiki/apps/widgets/badges/templates/badge-catalog.html
@@ -1,19 +1,4 @@
-{% extends "logged_in_base.html" %}
-
-{% load class_tags %}
-
-{% block page_title %}
-    Badge Catalog
-{% endblock %}
-
-{% block selected_icon %}selected-profile{% endblock %}
-
-{% block extra_head %}
-    {% import_page_css "profile" STATIC_URL CSS_THEME %}
-{% endblock %}
-
-{% block body %}
-    <div class="content-box">
+
         <div class="content-box-title">
             Badge Catalog
         </div>
@@ -43,5 +28,4 @@
 
             <a href="{% url profile_index %}">Back to profile</a>
         </div>
-    </div>
-{% endblock %}
+
diff --git a/makahiki/apps/widgets/badges/templates/index.html b/makahiki/apps/widgets/badges/templates/index.html
@@ -1,41 +1,50 @@
 {% load class_tags %}
 
-<div class="content-box"> 
-    <div class="content-box-title">
-        My Badges
-        <a href="#" style="float: right">
-            <img src="{{ STATIC_URL}}/css/default/images/icon-help-sm.png" width="20"
-                 align="center"
-                 title="Click to get help about this window"
-                 onclick="toggleHelp('widget', 'my-badges'); return false;"
-                    /></a>
-    </div>
-    <div class="content-box">
-        {# <h5>Individual Badges</h5> #}
-        <table>
-            <tr>
-                <th id="profile-user-badge-image-header"></th>
-                <th>Badge</th>
-                <th>
-                    Achievement
-                </th>
-            </tr>
-            {% if user.badges_earned.count > 0 %}
-                {% for awarded in user.badges_earned.all %}
-                    <tr>
-                        <td><img src="{{STATIC_URL}}{{awarded.badge.image}}"/></td>
-                        <td>{{ awarded.badge.name }}</td>
-                        <td>{{ awarded.badge.description.0 }}</td>
-                    </tr>
-                {% endfor %}
-            {% else %}
-                <tr>
-                    <td colspan="3">You don't have any badges yet!</td>
-                </tr>
-            {% endif %}
-        </table>
-        <div >
-            <a href="{% url profile_badges %}">See Badge Catalog</a>
-        </div>
-    </div> 
-</div>
+  <div class="content-box-title">
+      My Badges
+      <a href="#" style="float: right">
+          <img src="{{ STATIC_URL}}/css/default/images/icon-help-sm.png" width="20"
+               align="center"
+               title="Click to get help about this window"
+               onclick="toggleHelp('widget', 'my-badges'); return false;"
+                  /></a>
+  </div> 
+  {# <h5>Individual Badges</h5> #}
+  <table>
+      <tr>
+          <th class="width-ten-percent"></th>
+          <th>Badge</th>
+          <th>
+              Achievement
+          </th>
+      </tr>
+      {% if user.badges_earned.count > 0 %}
+          {% for awarded in user.badges_earned.all %}
+              <tr>
+                  <td><img src="{{STATIC_URL}}{{awarded.badge.image}}"/></td>
+                  <td>{{ awarded.badge.name }}</td>
+                  <td>{{ awarded.badge.description.0 }}</td>
+              </tr>
+          {% endfor %}
+      {% else %}
+          <tr>
+              <td colspan="3">You don't have any badges yet!</td>
+          </tr>
+      {% endif %}
+  </table>
+  <div >
+
+<!--Bootstrap modal dialog-->
+<a  data-toggle="modal" href="#badge-catalog"> See Badge Catalog </a> 
+  <div id="badge-catalog" class="modal hide">
+      <div class="modal-body">
+          {% include "badge-catalog.html" %}
+      </div>
+      <div class="modal-footer">
+          <a href="#" class="btn" data-dismiss="modal">Close</a>
+      </div>
+  </div>
+
+<!--end modal--> 
+     <!-- <a href="{% url profile_badges %}" class="margin-one-third">See Badge Catalog</a>-->
+  </div> 
diff --git a/makahiki/apps/widgets/my_commitments/templates/index.html b/makahiki/apps/widgets/my_commitments/templates/index.html
@@ -1,6 +1,6 @@
 {% load class_tags %}
 {% load avatar_tags %}
-
+ <div class="content-box">
         <div class="content-box-title">
             My Public Commitments
             <a href="#" style="float: right">
@@ -10,6 +10,7 @@
                      onclick="toggleHelp('widget', 'my-public-commitments'); return false;" />
             </a>
         </div>
-        <div >
+        <div>
             {% include "user_commitments.html" %}
         </div> 
+</div>
diff --git a/makahiki/apps/widgets/notifications/templates/index.html b/makahiki/apps/widgets/notifications/templates/index.html
@@ -1,6 +1,6 @@
 {% if view_objects.notifications %}
     {% if view_objects.notifications.unread %}
-        <ul id="notification-list">
+        <ul class="notification-list">
             {% for notification in view_objects.notifications.unread %}
                 {% include "widgets/notifications/templates/notifications/list-item.html" %}
             {% endfor %}

diff --git a/makahiki/apps/widgets/notifications/templates/notifications/list-item.html b/makahiki/apps/widgets/notifications/templates/notifications/list-item.html
@@ -3,12 +3,11 @@
 <li id="notification-item-{{notification.id}}"
     class="{{notification.style_class}} notification-item">
     <!-- FIXME: don't like the width 700px CAM -->
-    <div class="notification-contents"
-         {% if notification.is_success %}style='width: 700px'{% endif %}>
+    <div class="notification-contents">
         <div class='notice-icon'>
             <span class="ui-icon {{notification.icon_class}}"></span>
         </div>
-        <div class='notice-content' {% if notification.is_success %}style='width: 650px'{% endif %}>
+        <div class='notice-content'>
             {{ notification.contents|safe }}
         </div>
     </div>

diff --git a/makahiki/apps/widgets/quests/templates/index.html b/makahiki/apps/widgets/quests/templates/index.html
@@ -2,10 +2,10 @@
 
 {% load class_tags %}
 
-<div id="quest-box" style="clear: both">
-    <div id="quest-header">
-        <h3 id="quest-title">Your Quests</h3>
-        <a href="#" style="float: right">
+<div id="quest-box">
+    <div id="quest-header" class="makahiki-box-title">
+        <h3 id="quest-title" class="makahiki-box-title">Your Quests</h3>
+        <a href="#">
             <img src="{{ STATIC_URL}}/css/default/images/icon-help-sm.png" width="20" align="center"
                  title="Click to get help about this window"
                  onclick="toggleHelp('widget', 'quests'); return false;"
@@ -20,7 +20,7 @@ <h3 id="quest-title">Your Quests</h3>
     {% endif %}
 
     <div id="quest-details" style="margin: 0px 10px; display: none">
-        <div id="quest-contents" style="clear:both"></div>
+        <div id="quest-contents" class="quest-description" style="clear:both"></div>
         <a href="javascript:void(0)" id="quest-hide">Close</a>
 
         <div style="clear:both"></div>

diff --git a/makahiki/apps/widgets/quests/templates/quest_list.html b/makahiki/apps/widgets/quests/templates/quest_list.html
@@ -1,6 +1,6 @@
 {% load class_tags %}
 
-<ul id="quest-list">
+<ul class="quest-list">
     {# set variable to indicate that these are user quests. #}
     {% with "true" as user_quest %}
         {% for quest in view_objects.quests.user_quests %}

diff --git a/makahiki/apps/widgets/smartgrid/templates/task.html b/makahiki/apps/widgets/smartgrid/templates/task.html
@@ -18,12 +18,14 @@
 {% endblock %}
 
 {% block body %}
-    <div {% get_id_and_classes "activity-task-stats" %}>
-        <div {% get_id_and_classes "activity-task-stats-box" %}>
-            <div {% get_id_and_classes "activity-task-stats-title" %}>
+<div class="container-fluid">
+    <div class="row-fluid">
+    <div class="span6">
+        <div class="content-box">
+            <div class="content-box-title">
                 {{ task.type|capfirst }} : {{ task.name }}
             </div>
-            <div {% get_id_and_classes "activity-task-stats-content" %}>
+            <div class="content-box-contents">
                 {% if task.is_canopy %}
                     <p/> This is a Canopy {{ task.type|capfirst }}.
                 {% endif %}
@@ -112,7 +114,7 @@
                             </button>
                         </a>
                     {% else %}
-                        <a href="/actions">
+                        <a href="/learn/">
                             <button style="cursor:pointer;">
                                 <img src="{{ STATIC_URL}}/css/default/images/left.png" width="50"
                                      align="top">
@@ -125,9 +127,9 @@
         </div>
     </div>
 
-    <div {% get_id_and_classes "activity-task-details" %}>
-        <div {% get_id_and_classes "activity-task-details-box" %}>
-            <div {% get_id_and_classes "activity-task-details-title" %}>
+    <div class="span6">
+        <div class="content-box">
+            <div class="content-box-title">
                 <table>
                     <tr>
                         <td>About the {{ task.type }}</td>
@@ -142,7 +144,7 @@
                     </tr>
                 </table>
             </div>
-            <div {% get_id_and_classes "activity-task-details-content" %}>
+            <div class="content-box-contents">
                 {% if pau %}
                     {% if approval.approval_status == "approved" or approval.award_date %}
                         <div {% get_id_and_classes "activity-task-details-info" %}>
@@ -356,6 +358,8 @@
             </div>
         </div>
     </div>
+    </div>
+</div>    
 {% endblock %}
 
 {% block extra_body %}

diff --git a/makahiki/apps/widgets/smartgrid/views.py b/makahiki/apps/widgets/smartgrid/views.py
@@ -595,6 +595,7 @@ def _calculate_task_duration(task):
 def _create_activity_request_form(request, task, user, approval, pau):
     """ Create activity request form """
     form_title = "Get your points"
+    question = "?"
 
     social_email = None
     social_email2 = None