Fixing up the pure open-source codebase

scrumdo-web/apps/activities/signal_handlers.py

@@ -9,11 +9,8 @@
 from threadedcomments.models import ThreadedComment
 from activities.utils import allinstances, instanceof
 from scrumdo_model_utils.models import InheritanceCastModel
-try:
-    from scrum_log.models import ScrumLog
-    HAS_SCRUMLOG = True
-except ImportError:
-    HAS_SCRUMLOG = False
+from scrum_log.models import ScrumLog
+
 from activities.models import *
 import projects.signals as signals
 
@@ -136,19 +133,19 @@ def onIterationDeleted(sender, **kwargs):
 signals.iteration_deleted.connect( onIterationDeleted , dispatch_uid="newsfeed_signal_hookup")
 
 
-if HAS_SCRUMLOG:
-    def onScrumLogPosted(sender, instance, signal, *args, **kwargs):
-        try:        
-            icon = "group"
-            if instance.flagged:
-                icon = "flag_red"
-            item = NewsItem(user=instance.creator, project=instance.project, icon=icon )
-            item.text = render_to_string("activities/scrumLog.txt", {'item':instance} )
-            item.save()
-        except:
-            logger.error("Could not create news item")
-            traceback.print_exc(file=sys.stdout)
-    models.signals.post_save.connect(onScrumLogPosted, sender=ScrumLog)
+
+def onScrumLogPosted(sender, instance, signal, *args, **kwargs):
+    try:        
+        icon = "group"
+        if instance.flagged:
+            icon = "flag_red"
+        item = NewsItem(user=instance.creator, project=instance.project, icon=icon )
+        item.text = render_to_string("activities/scrumLog.txt", {'item':instance} )
+        item.save()
+    except:
+        logger.error("Could not create news item")
+        traceback.print_exc(file=sys.stdout)
+models.signals.post_save.connect(onScrumLogPosted, sender=ScrumLog)
 
 
 def onCommentPosted(sender, **kwargs):

scrumdo-web/apps/organizations/templates/organizations/base.html

@@ -5,7 +5,7 @@
 {% load i18n %}
 
 {% block body_class %}projects{% endblock %}
-{% block body_div_class %}sideBar{% endblock %}
+{% block body_div_class %}narrow_body_with_sidebar{% endblock %}
 
 {% block extra_head %}        
 <link rel="stylesheet" href="{{ STATIC_URL }}css/organization.css" />

scrumdo-web/apps/organizations/templates/organizations/organization_dashboard.html

@@ -17,7 +17,8 @@
 {% block body %}
 
 
-
+	<h1>{{organization.name}}</h1>
+
 	<div id="organization-menu">
 		<a href="{% url organization_dashboard organization.slug %}"><img src="{{STATIC_URL}}images/organization/sel_dashboard_button.png"></a><a href="{% url organization_projects organization.slug %}"><img class="rollover"  src="{{STATIC_URL}}images/organization/projects_button.png"></a><a href="{% url team_summary organization.slug %}"><img class="rollover" src="{{STATIC_URL}}images/organization/teams_button.png"></a><a href="{% url export_organization organization.slug %}"><img class="rollover" src="{{STATIC_URL}}images/organization/export_button.png"></a>
 	</div>

scrumdo-web/apps/organizations/templates/organizations/organization_export.html

@@ -17,7 +17,7 @@
 
 {% block body %}
 
-
+<h1>{{organization.name}}</h1>
 
 
 	<div id="organization-menu">		

scrumdo-web/apps/organizations/templates/organizations/organization_panel.html

@@ -15,12 +15,6 @@
     <div class="box-title">
       Tools
     </div><!--box-title-->
-    <div class="box-content">
-      <a href="{% url project_create  %}?org={{organization.id}}">{% silk "database_table" %} New Project</a>
-    </div><!--box-content-->
-    <div class="box-content">
-      <a href="{% url team_create organization.slug %}">{% silk "group" %} New Team</a>
-    </div><!--box-content-->
     {% endif %}
     <div class="box-title">
       {% if organization %}Other {% endif %}Organizations

scrumdo-web/apps/organizations/templates/organizations/organization_projects.html

@@ -14,7 +14,7 @@
 
 
 {% block body %}
-<div style="width:950px">
+
 	<h1>{{organization.name}}</h1>
 
 	<div id="organization-menu">
@@ -67,7 +67,7 @@ <h2>{{ project.name }}</h2>
   {% endcanread %}
 {% endfor %}
 
-</div>
+
 
 
     <script type="text/javascript" charset="utf-8">

scrumdo-web/apps/organizations/templates/organizations/organization_teams.html

@@ -16,7 +16,7 @@
 
 {% block body %}
 
-
+<h1>{{organization.name}}</h1>
 
 	<div id="organization-menu">		
 		<a href="{% url organization_dashboard organization.slug %}"><img class="rollover" src="{{STATIC_URL}}images/organization/dashboard_button.png"></a><a href="{% url organization_projects organization.slug %}"><img class="rollover" src="{{STATIC_URL}}images/organization/projects_button.png"></a><a href="{% url team_summary organization.slug %}"><img src="{{STATIC_URL}}images/organization/sel_teams_button.png"></a><a href="{% url export_organization organization.slug %}"><img class="rollover" src="{{STATIC_URL}}images/organization/export_button.png"></a>