Merge pull request #562 from akatsoulas/940277

[fix bug 940277] [fix bug 931068] Active report template and view.
mozilla · Dec 10, 2013 · d9095a4 · d9095a4
2 parents 5aa7097 + b004464
commit d9095a4
Show file tree

Hide file tree

Showing 9 changed files with 480 additions and 27 deletions.
diff --git a/remo/base/static/base/css/app-fd4.less b/remo/base/static/base/css/app-fd4.less
@@ -1479,6 +1479,33 @@ small.error {
         height: auto;
         padding: 1em .5em .5em .5em;
     }
+    h1 {
+        margin-bottom: 40px;
+    }
+    h3 {
+        margin-bottom: 20px;
+    }
+    h4 {
+        display: inline-block;
+        padding: 0 .5em;
+        margin: 10px 0 0 0;
+        .opensans;
+        font-weight: normal;
+        font-size: 11px;
+        line-height: 1.5;
+        background-color: #ccc;
+        color: #444;
+        text-shadow: none;
+        -moz-border-radius: 3px;
+        -webkit-border-radius: 3px;
+        border-radius: 3px;
+    }
+    time {
+        display: block;
+        margin-top: 10px;
+        font-family: 'Open Sans Light';
+        font-size: 12px;
+    }
     .pict-icon.large.search {
         float: left;
         margin-right: 5px;
@@ -1495,10 +1522,6 @@ small.error {
     .report-item {
         margin-bottom: 20px;
     }
-    .label.warning {
-        background: red;
-        color: #fff;
-    }
     #reportform {
         h1 {
             margin-bottom: 40px;
@@ -1507,7 +1530,8 @@ small.error {
     .edit-box {
         margin-bottom: 40px;
     }
-    ul.report-admin {
+    ul.report-admin,
+    ul.contribution-areas {
         list-style-type: none;
         margin: 0;
         padding: 0;
@@ -1516,6 +1540,13 @@ small.error {
             padding: 0;
         }
     }
+    ul.contribution-areas {
+        margin-top: 10px;
+        font-family: 'Open Sans Light';
+        li {
+            font-size: 12px;
+        }
+    }
     .comment-icon {
         float: left;
         width: 4.15%;
@@ -1524,6 +1555,7 @@ small.error {
     .comment-item {
         float: right;
         width: 95.75%;
+        font-family: 'Open Sans Light';
     }
     #reports-pagination {
         text-align: right;
@@ -1597,8 +1629,9 @@ small.error {
             display: block;
             margin: 0 auto;
         }
-        .smallmap-profile {
-            text-align: left;
+        .smallmap-profile,
+        .profile-image {
+            text-align: center;
         }
         .comment-icon,
         .comment-item {
@@ -2688,7 +2721,6 @@ ul.mreports li.editable a {
 .leaflet-control-mapbox-geocoder-form input {
     margin-top: 0px;
 }
-
 /* -----------------------------------------
    Dashboard Styles
 ----------------------------------------- */

diff --git a/remo/reports/forms.py b/remo/reports/forms.py
@@ -4,8 +4,8 @@
 
 import happyforms
 
-from remo.reports.models import (NGReport, Report, ReportComment, ReportEvent,
-                                 ReportLink)
+from remo.reports.models import (NGReport, NGReportComment, Report,
+                                 ReportComment, ReportEvent, ReportLink)
 
 
 # Old reporting system
@@ -133,3 +133,12 @@ class Meta:
         widgets = {'longitude': forms.HiddenInput(),
                    'latitude': forms.HiddenInput(),
                    'functional_areas': forms.SelectMultiple()}
+
+
+class NGReportCommentForm(happyforms.ModelForm):
+    """Model Form for new generation commenting system."""
+
+    class Meta:
+        model = NGReportComment
+        fields = ['comment']
+        widgets = {'comment': forms.TextInput()}
diff --git a/remo/reports/models.py b/remo/reports/models.py
@@ -64,7 +64,8 @@ def report_set_groups(app, sender, signal, **kwargs):
              'can_delete_report_comments': ['Admin', 'Mentor'],
              'add_ngreport': ['Admin', 'Mentor'],
              'change_ngreport': ['Admin', 'Mentor'],
-             'delete_ngreport': ['Admin', 'Mentor']}
+             'delete_ngreport': ['Admin', 'Mentor'],
+             'delete_ngreportcomment': ['Admin', 'Mentor']}
 
     add_permissions_to_groups('reports', perms)
 
@@ -290,5 +291,18 @@ class NGReportComment(models.Model):
     created_on = models.DateTimeField(auto_now_add=True)
     comment = models.TextField()
 
+    def _get_url_args(self):
+        args = [self.report.user.userprofile.display_name,
+                self.report.report_date.year,
+                utils.number2month(self.report.report_date.month),
+                self.report.report_date.day,
+                self.report.id,
+                self.id]
+        return args
+
+    def get_absolute_delete_url(self):
+        return reverse('remo.reports.views.delete_ng_report_comment',
+                       args=self._get_url_args())
+
     class Meta:
         ordering = ['id']
diff --git a/remo/reports/r_urls.py b/remo/reports/r_urls.py
@@ -22,7 +22,7 @@
         'edit_ng_report', name='reports_ng_edit_report'),
     url(r'^(?P<year>\d+)/(?P<month>\w+)/(?P<day>\d+)/(?P<id>\d+)/delete/$',
         'delete_ng_report', name='reports_ng_delete_report'),
-    url((r'^(?P<year>\d+)/(?P<month>\w+)/d(?P<day>\d+)/'
-         '(?P<id>\d+)/delete/comment/(?P<comment_id>\d+)/$'),
+    url((r'^(?P<year>\d+)/(?P<month>\w+)/(?P<day>\d+)/(?P<id>\d+)'
+        '/comment/(?P<comment_id>\d+)/delete/$'),
         'delete_ng_report_comment', name='reports_ng_delete_report_comment'),
 )