4173 Commits

Author SHA1 Message Date
Aditi
47b0c3160e Add Blog Edit button. 2013-07-29 18:00:02 +05:30
Aditi
72514eb272 Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
2013-07-29 13:31:35 +05:30
Aditi
221cde5711 Fix error in blog edit view. 2013-07-29 13:27:30 +05:30
Aditi
8f6a0bf44e Change Redirect url to blog dashboard in blog_edit view. 2013-07-29 11:08:03 +05:30
tilly-Q
3aa3871b90 This commit had some important milestones in it. The major update is that now I
have mostly completed the moderator punishment and resolution of reports. Along
with this, I have also added one last table to the database: one that holds ar-
-chived (or resolved) reports. This is some of the primary functionality of my
whole update, so this is a big step! The other changes I made this update are
primarily organizational. I refactored some of my code into functions and I cl-
eaned up many of my templates.

--\ mediagoblin/db/models.py
--| Created the new ArchivedReport table
--| Removed columns from BaseReport table that are only necessary for Archived
  |    reports

--\ mediagoblin/db/migrations.py
--| Created the new ArchivedReport table
--| Removed columns from BaseReport table that are only necessary for Archived
  |    reports

--\ mediagoblin/db/util.py
--| Created the user_privileges_to_dictionary function. This is useful for
  |    accessing a user's permissions from within a template.

--\ mediagoblin/moderation/forms.py
--| Expanded the disciplinary actions a moderator can take
--| Allowed the moderator to choose more than one disciplinary action at a time
  |    (It's now managed with a list of checkboxes rather than radio buttons)
----| Pulled a MultiCheckBox class from  a wtforms tutorial
--| Added various other form inputs for details of the moderator's disciplinary
  |    actions
--| Tried to ensure that every string is unicode and translated

--\ mediagoblin/moderation/tools.py
--| Created this file for holding useful moderation tools
--| Moved the penalizing code from views to the function take_punitive_actions
--| Added many more types of punitive actions
--| Added the archiving of old reports

--\ mediagoblin/moderation/views.py
--| Used the privileges_to_dictionary function for the Users Detail view to
  |   allow for different actions available to a moderator and an admin.
--| Added in functionality for ArchivedReports to the reports_detail and
  |   reports_panel views
--| Moved the punishments of repots_detail to tools.py (as mentioned above)

--\ mediagoblin/static/css/base.css
--| Added new styling for the User Detail page

--\ mediagoblin/static/images/icon_clipboard_alert.png
--| Added this image to represent unresolved reports

--\ mediagoblin/templates/mediagoblin/moderation/report.html
--| Added 'Return to Reports Panel' button
--| Fixed the spacing to be less that 80 columns wide
--| Added in display for Archived Reports

--\ mediagoblin/templates/mediagoblin/moderation/reports_panel.html
--| Changed the placement and columns of the tables
--| Fixed the spacing to be less that 80 columns wide
--| Added in display for Archived Reports

--\ mediagoblin/templates/mediagoblin/moderation/user.html
--| Fixed the spacing to be less that 80 columns wide
--| Took away the moderator's ability to add and remove privileges at will.
  |  Only the admin has this power now.

--\ mediagoblin/templates/mediagoblin/moderation/users_panel.html
--| Fixed the spacing to be less that 80 columns wide

--\ mediagoblin/tools/response.py
--| Added in code to remove a UserBan from a User if that user logs in after
  |  the expiration date
2013-07-27 16:44:40 -04:00
Christopher Allan Webber
99d79749c4 Set up in-package virtualenv via make 2013-07-25 15:15:49 -05:00
Christopher Allan Webber
68f6f91339 Removing aclocal.m4, which is autogenerated 2013-07-25 14:56:08 -05:00
Christopher Allan Webber
7b3d6c675e Adding .gitignore for pyconfigure/automake generated files 2013-07-25 14:53:18 -05:00
Christopher Allan Webber
00ed01b7cb Moving setup.py.in back to setup.py 2013-07-25 14:34:48 -05:00
Christopher Allan Webber
2723bb154a Merge remote-tracking branch 'refs/remotes/brandoninvergo/pyconfigure' into merge-pyconfigure 2013-07-25 14:29:30 -05:00
Christopher Allan Webber
9a2b36c9a2 More up to date README 2013-07-25 14:05:50 -05:00
Aditi
c29e790d57 Remove action url from form action. 2013-07-25 15:04:05 +05:30
Aditi
bed960cba9 Fix blog extraction for get and post both type of requests. 2013-07-25 15:00:31 +05:30
Aditi
0ccfedf8a1 Change edit url to a button for each blog post. 2013-07-25 13:21:35 +05:30
Aditi
500cb7f91c Add edit url for each blog post. 2013-07-25 13:17:44 +05:30
Aditi
9a5f8b37a3 Add 'Add Blog Post' button on blog dashboard. 2013-07-24 15:34:51 +05:30
Aditi
ab7b83dbc8 Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
2013-07-24 10:32:20 +05:30
Christopher Allan Webber
b889f97156 Move the "cd mediagoblin" to the right line. Thanks usrnix!
This commit sponsored by Kenneth Dombrowski.  Thanks!
2013-07-23 20:24:30 -05:00
xray7224
005181b166 Renames OAuth1 code to federation 2013-07-22 17:06:00 +01:00
xray7224
657263abdf Refactor WTFormData 2013-07-22 16:56:22 +01:00
Jessica Tallon
8e3bf97821 Fix problem with migration - OAuth 2013-07-22 17:17:01 +01:00
Aditi
06aca6af73 Write template for blog_dashboard. 2013-07-22 19:15:06 +05:30
Aditi
bdc3dfde65 Format url for blog_dashboard view. 2013-07-22 19:12:54 +05:30
Aditi
5cb38a2886 Write blog_dashboard view. 2013-07-22 19:11:33 +05:30
Aditi
f6cee302e4 Fix attribute error by writing request.user.is_admin. 2013-07-22 19:10:36 +05:30
Aditi
6353362546 Change class name to BlogPostData(camelcase) and add blog id attribute to the class. 2013-07-22 07:04:29 +05:30
Aditi
391f4456a2 Create may_edit_blogpost function. 2013-07-22 07:01:28 +05:30
Aditi
5230b41895 Remove form action url. 2013-07-21 18:03:48 +05:30
Aditi
511ce0d6c7 Fix media type. 2013-07-21 17:21:01 +05:30
Aditi
783b50057b Make changes in blogpost_edit view. 2013-07-21 17:19:57 +05:30
Aditi
e058cdce91 Create view for blogpost_edit. 2013-07-21 11:24:44 +05:30
Aditi
aebc179da2 Remove unused import. 2013-07-21 11:22:46 +05:30
Jessica Tallon
617bff1830 Fixes some typo's and removes unused imports 2013-07-20 19:08:02 +01:00
Aditi
26de7c2267 Change in blogpost create Url. 2013-07-20 11:35:46 +05:30
Aditi
bafaa93d8c Remove BlogPost model and Add attribute for blog id in BlogPostData. 2013-07-20 11:28:10 +05:30
Aditi
00993a68e5 Add temporary template for blogpost create/edit view. 2013-07-20 11:25:32 +05:30
Aditi
9505f1a395 Add BlogPostMediaManager and setup_plugin. 2013-07-20 11:23:12 +05:30
Aditi
145a173851 Indent properly. 2013-07-20 11:01:52 +05:30
Aditi
0574d30d9a temperory url change for creating a new blog. 2013-07-19 19:33:49 +05:30
Aditi
fa5a13f8f3 Wrote blogpost_create view. 2013-07-19 19:29:13 +05:30
Aditi
03e2a0f806 Add blog media_type plugin to plugin section. 2013-07-19 16:58:35 +05:30
Aditi
b1e234365c Change view and urls for blog edit/create page. 2013-07-19 16:55:42 +05:30
Aditi
e0e02e98bc Replace hardcoded URL by variable for the same. 2013-07-19 16:52:35 +05:30
Aditi
8ab67da4ae Add class BlogMixin. 2013-07-19 16:47:27 +05:30
Aditi
4261c85f04 Create file for utility function and add function. 2013-07-19 16:40:21 +05:30
Aditi
af8f995f38 Add view for blog edit and create page. 2013-07-19 16:37:22 +05:30
xray7224
7271b06282 Moves first versions of the the models to migrations 2013-07-18 20:39:15 +01:00
xray7224
8ddd7769de Adds migration for OAuth1 tables 2013-07-18 20:24:35 +01:00
xray7224
89d5b44e0a Adds test for request_tokens 2013-07-18 19:15:05 +01:00
tilly-Q
6bba33d7e6 Whew. This is a big update. I did some significant keeping work. I moved all of
the folders and enpoints labeled 'admin' to the more accurate term of 'moderat-
ion.' I also created the ability for admins and moderators to add or remove pr-
ivileges or to ban a user in response to a report. This also meant implementing
the UserBan class in various places. I also had to add a column called result
to the ReportBase table. This allows the moderator/admin to leave comments when
they respond to a report, allowing for archiving of what responses they do/n't
take.

--\ mediagoblin/db/migrations.py
--| Added result column to ReportBase

--\ mediagoblin/db/models.py
--| Added result column to ReportBase
--| Added documentation to tables I had made previously

--\ mediagoblin/decorators.py
--| Editted the user_has_privilege decorator to check whether a user has been
  | banned or not
--| Created a seperate user_not_banned decorator to prevent banned users from
  | accessing any pages
--| Changed require_admin_login into require_admin_or_moderator login

--\ mediagoblin/gmg_commands/users.py
--| Made the gmg command `adduser` create a user w/ the appropriate privileges

--\ mediagoblin/moderation/routing.py  << formerly mediagoblin/admin/routing.py
--| Renamed all of the routes from admin -> moderation

--\ mediagoblin/routing.py
--| Renamed all of the routes from admin -> moderation

--\ mediagoblin/moderation/views.py << formerly mediagoblin/admin/views.py
--| Renamed all of the routes & functions from admin -> moderation
--| Expanded greatly on the moderation_reports_detail view and functionality
--| Added in the give_or_take_away_privilege form, however this might be a use-
  | -less function which I could remove (because privilege changes should happe-
  | n in response to a report so they can be archived and visible)

--\ mediagoblin/static/css/base.css
--| Added in a style for the reports_detail page

--\ mediagoblin/templates/mediagoblin/base.html
--| Renamed all of the routes from admin -> moderation

--\ mediagoblin/templates/mediagoblin/moderation/report.html
--| Added form to allow moderators and admins to respond to reports.

--\ mediagoblin/templates/mediagoblin/moderation/reports_panel.html
--| Fixed the table for closed reports

--\ mediagoblin/templates/mediagoblin/moderation/user.html
--| Added in a table w/ all of the user's privileges and the option to add or
  | remove them. Again, this is probably vestigial
--| Renamed all of the routes from admin -> moderation

--\ mediagoblin/templates/mediagoblin/moderation/user_panel.html
--| Renamed all of the routes from admin -> moderation

--\ mediagoblin/tools/response.py
--| Added function render_user_banned, this is the view function for the redir-
  | -ect that happens when a user tries to access the site whilst banned

--\ mediagoblin/user_pages/forms.py
--| Added important translate function where I had text

--\ mediagoblin/user_pages/lib.py
--| Renamed functiion for clarity

--\ mediagoblin/user_pages/views.py
--| Added the user_not_banned decorator to every view

--\ mediagoblin/views.py
--| Added the user_not_banned decorator

--\ mediagoblin/moderation/forms.py
--| Created this new file

--\ mediagoblin/templates/mediagoblin/banned.html
--| Created this new file
--| This is the page which people are redirected to when they access the site
  | while banned
2013-07-17 16:16:07 -04:00