338 Commits

Author SHA1 Message Date
Christopher Allan Webber
4b24678a1f Adding WAI-ARIA attributes to the header dropdown (Fix by Aleksej Serdjukov)
This fixes issue #754

Thanks Aleksej!
2014-07-10 10:24:37 -05:00
tilly-Q
0d6550fb05 Tweaked the metadata edit screen to run jsonschema validators against the data. 2014-05-14 11:51:13 -04:00
tilly-Q
b5dd245989 Made the metadata table functional within the new metadata_display plugin and
removed all traces of it from core.
2014-05-12 18:07:31 -04:00
tilly-Q
9ceea31c5b Made the metadata table look pretty 2014-05-12 14:27:26 -04:00
tilly-Q
7bcb3e100c Merge branch 'metadata-editor' into metadata 2014-05-12 12:26:07 -04:00
tilly-Q
494bce47f9 Changed the format of the wtforms table slightly 2014-05-12 12:20:03 -04:00
Christopher Allan Webber
3850b3fb56 Removing the mediagoblin.jsonld file, which really was just the RDFa 1.1 file.
This commit sponsored by Matthew Cope.  Thanks!
2014-05-09 14:32:46 -05:00
Christopher Allan Webber
e5e2cc2f16 Starting to add metadata tools, as well as mediagoblin's schema 2014-05-07 18:41:34 -05:00
tilly-Q
f73585be47 Fixed a slight css error. 2014-05-06 17:23:22 -04:00
tilly-Q
e80596c80e Created a UI for editting a media's metadata. Had to add a new macro to
wtforms.html in the process.
2014-05-06 17:00:25 -04:00
jpope
a19c00c1e3 adjust exif info alignment 2014-01-13 11:37:36 -06:00
jpope
27fc8ef26f adjust exif to match other sections and remove extra css 2014-01-13 08:14:00 -06:00
jpope
5cdf3a0a14 move "wide" view to seperate branch 2014-01-08 00:08:11 -06:00
jpope
4a9a796a7f rename couple of css classes 2014-01-07 23:23:53 -06:00
jpope
1469f432fc adjust thumbnails 2014-01-07 20:39:33 -06:00
jpope
d598a403e5 center media within media container 2014-01-07 19:46:58 -06:00
jpope
da4d97e0fd add a little button color and new media page layout 2014-01-07 17:52:38 -06:00
jpope
fe024f0be7 skeletonize frontpage welcome 2014-01-07 12:09:02 -06:00
jpope
a5ac282c9b debone and redo the header 2014-01-07 01:05:01 -06:00
jpope
ff9b6b51b0 adjust mod report page 2014-01-06 20:27:32 -06:00
jpope
7bc68035b5 small adjustments to user mod page again 2014-01-06 18:31:57 -06:00
jpope
a054ab3d5a realign the user admin page 2014-01-06 18:18:52 -06:00
jpope
45842f840f migrate media page to skeleton 2014-01-06 15:19:14 -06:00
jpope
3bb58e6f0a more skeleton migrations 2014-01-06 10:52:11 -06:00
jpope
8b8698eff5 start moving more to skeleton 2014-01-05 20:47:36 -06:00
jpope
f13016943f undo that "update" 2014-01-05 17:12:13 -06:00
jpope
3db134b88c updated 2014-01-05 16:56:47 -06:00
jpope777
5970a855f6 incorporate skeleton layout in the galleries 2014-01-01 00:48:23 -06:00
jpope777
3e2a1f155e add symlinks to skeleton 2013-12-31 15:00:16 -06:00
Sebastian Spaeth
a42dda21f9 Merge branch 'master' into upstream-master
Conflicts:
	mediagoblin/templates/mediagoblin/base.html
	mediagoblin/templates/mediagoblin/user_pages/user.html
2013-12-12 16:24:34 +01:00
Christopher Allan Webber
56c4ad89eb Merge remote-tracking branch 'refs/remotes/tilly-q/OPW-Moderation-Update'
Conflicts:
	mediagoblin/templates/mediagoblin/user_pages/user.html
	mediagoblin/tests/test_auth.py
	mediagoblin/tests/test_submission.py
2013-10-07 15:48:33 -05:00
Christopher Allan Webber
81008d25a2 Adding the .xcf file of the MediaGoblin goblin.
This commit sponsored by Alexandre Hannud Abdo.  Thank you!
2013-09-19 18:46:46 -05:00
Christopher Allan Webber
4851fd9d15 We're no longer using this image, as awesome as it is 2013-09-19 18:43:05 -05:00
Christopher Allan Webber
74ae6fb0b6 Merge remote-tracking branch 'refs/remotes/rodney757/auth_refactor'
Conflicts:
	mediagoblin/auth/views.py
	mediagoblin/edit/forms.py
	mediagoblin/templates/mediagoblin/edit/edit_account.html
2013-09-19 16:04:23 -05:00
Aditi Mittal
bca32cd474 Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin 2013-09-18 22:23:36 +05:30
Christopher Allan Webber
28eab59ace Merge remote-tracking branch 'refs/remotes/rodney757/file_limits'
Conflicts:
	mediagoblin/db/migrations.py
2013-09-18 11:21:57 -05:00
tilly-Q
045fe0ee9d Merge branch 'master' into OPW-Moderation-Update
Conflicts:
	mediagoblin/db/migrations.py
2013-09-12 18:58:04 -04:00
tilly-Q
6acf4ee60e This should be my final code update before I am ready for review! Basically, in
this update I finished the search/sort function on the Reports Panel. I also
finished the Terms of Service and made the decision to remove the meta portion
of the site I had planned to create. I decided that the features involved were
just unnecessary at this point. I also dropped the User status column and added
a migration to establish default privileges (and create the privilege foundat-
-ions. I fixed a few small errors that were left over as well, in the implemen-
tation and in the tests. Next, I just need to await code review and work on the
documentation for these new features. I also need to supervise a new merge to
master.

===============================================================================
    Dropped the vestigial 'status' column
===============================================================================
--\ mediagoblin/db/migrations.py
--\ mediagoblin/db/models.py
--| Also added in comments describing the current situation with the `is_admin`
  | and `email_verified` columns, where they are 100% vestigial but cannot be
  | dropped.

===============================================================================
            Wrote necessary migrations to set up Privilege
    foundations and give users the necessary privileges on an older
     implementation of mediagoblin that is migrating into this update
===============================================================================
--\ mediagoblin/db/migrations.py

===============================================================================
    Deleted the meta pages
===============================================================================
--\ Deleted mediagoblin/meta/__init__.py
--\ Deleted mediagoblin/meta/routing.py
--\ Deleted mediagoblin/meta/views.py
--\ Deleted mediagoblin/templates/mediagoblin/meta/code_of_conduct.html
--\ Deleted mediagoblin/templates/mediagoblin/meta/reports_details.html
--\ Deleted mediagoblin/templates/mediagoblin/meta/reports_panel.html
    ----------------------------------------------------------------
        Moved the terms of service to /terms_of_service
    ----------------------------------------------------------------
    --\ Moved mediagoblin/templates/mediagoblin/meta/terms_of_service.html
        -> mediagoblin/templates/mediagoblin/terms_of_service.html
    --| I decided that terms of service were really the only necessary part of my
      | planned "meta" pages, so I moved it instead to its own singular page
    --\ mediagoblin/routing.py
    --\ mediagoblin/static/css/base.css
    --\ mediagoblin/templates/mediagoblin/base.html
    --\ mediagoblin/views.py

===============================================================================
          Simplified & Finished the Reports Panel Searching
===============================================================================
--\ mediagoblin/moderation/forms.py
--\ mediagoblin/moderation/tools.py
--\ mediagoblin/moderation/views.py
--\ mediagoblin/templates/mediagoblin/moderation/report_panel.html
--\ mediagoblin/templates/mediagoblin/moderation/user.html

===============================================================================
                  Fixed Small Errors
===============================================================================
--\ mediagoblin/templates/mediagoblin/user_pages/user.html
--\ mediagoblin/tests/test_moderation.py
--\ mediagoblin/tests/tools.py

===============================================================================
2013-09-10 13:17:07 -04:00
tilly-Q
25625107b6 This was a quick update, I mostly worked on the transition from using the old
User table columns (is_admin, status, email_verified) and making sure that
their functionality is instead completely handled by privileges. I also worked
on the meta pages which I hope to finish soon. I set up migrations to ensure
the default privileges are given to users that should have them. Lastly, I made
it so that banned users can log out.

===============================================================================
    Made Sure the Vestigial Columns of the User Table were not being Used
===============================================================================
--\ mediagoblin/auth/views.py
--\ mediagoblin/db/models.py
--\ mediagoblin/templates/mediagoblin/base.html
--\ mediagoblin/templates/mediagoblin/moderation/user.html
--\ mediagoblin/templates/mediagoblin/user_pages/collection_lis$
--\ mediagoblin/templates/mediagoblin/user_pages/user.html
--\ mediagoblin/tests/test_auth.py
--\ mediagoblin/tests/test_persona.py
--\ mediagoblin/user_pages/views.py

===============================================================================
    Wrote the Migrations to Set up the Default Privileges
===============================================================================
--\ mediagoblin/db/migrations.py
--\ mediagoblin/gmg_commands/users.py

===============================================================================
    Work on the Meta Pages
===============================================================================
--\ mediagoblin/meta/routing.py
--\ mediagoblin/meta/views.py
--\ mediagoblin/static/css/base.css
--\ mediagoblin/templates/mediagoblin/meta/terms_of_service.html

===============================================================================
    Small Changes
===============================================================================
--\ mediagoblin/templates/mediagoblin/base.html
--| Benevolently made it so that banned users can log out

===============================================================================
X   X   X   X   X   X   X   X   X   X   X   X   X   X   X   X   X   X   X   X
===============================================================================
2013-09-08 18:26:37 -04:00
tilly-Q
dc31cd1b65 I've moved on to one of the last phases of my work! Now I'm just checking off
items from my last to-do list. The biggest change in this commit is that I made
the moderation reports panel sortable via get request. I also added in page nu-
mbers so that more than 10 reports can be viewed. I'm hoping to go from here to
make a search page. Aside from that, there were only a few other changes I made
this time. I fixed two bugs in my code. I copy-ed and pasted function
mediagoblin.user_pages.views:media_preview_comment which I must've deleted ear-
-lier in a merge. And I moved some of the javascript I was using in the modera-
-tion templates into it's own seperate .js file.

===============================================================================
    Made the moderation reports panel view sortable
===============================================================================
--\ mediagoblin/moderation/forms.py
--\ mediagoblin/moderation/views.py
--\ mediagoblin/templates/mediagoblin/moderation/report_panel.html
--\ mediagoblin/templates/mediagoblin/moderation/user.html
--|  Made `<user> report history` into a link that automatically shows all open
  | and closed reports on <user>.

===============================================================================
    Grabbed some code from master that I accidentally deleted in a merge
===============================================================================
--\ mediagoblin/user_pages/views.py

===============================================================================
    Moved javascript away from templates into its own file
===============================================================================
--\ mediagoblin/static/js/setup_report_forms.js
--\ mediagoblin/templates/mediagoblin/moderation/report.html
--\ mediagoblin/templates/mediagoblin/moderation/user.html

===============================================================================
    Cleared trailing white space
===============================================================================
--\ mediagoblin/templates/mediagoblin/moderation/media_panel.html
--\ mediagoblin/moderation/tools.py
--\ mediagoblin/templates/mediagoblin/meta/terms_of_service.html
--\ mediagoblin/templates/mediagoblin/moderation/report_panel.html
--\ mediagoblin/templates/mediagoblin/user_pages/media.html
--\ mediagoblin/tests/test_modelmethods.py

===============================================================================
    Small fixes
===============================================================================
--\ mediagoblin/templates/mediagoblin/moderation/report.html
--|  Fixed a link so that it points to the correct user page

--\ mediagoblin/templates/mediagoblin/user_pages/media.html
--|  Fixed a bug that crashed this page when a guest visitted it (because
  | request.user is None)
2013-09-03 11:57:10 -04:00
Rodney Ewing
2188925bab javascript limit validation 2013-08-26 06:33:30 -07:00
Aditi
7d9dbe32cc Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin 2013-08-25 09:24:13 +05:30
Aditi
70cc6eb8f3 Resolve merge conflict and merge. 2013-08-22 22:34:06 +05:30
tilly-Q
9e204e49c9 Merge branch 'master' into OPW-Moderation-Update
Conflicts:
	mediagoblin/db/models.py
	mediagoblin/decorators.py
	mediagoblin/routing.py
	mediagoblin/user_pages/views.py
2013-08-20 12:21:13 -04:00
Rodney Ewing
4a2aa93c6a use urlgen and store it in a variable 2013-08-20 08:09:29 -07:00
Rodney Ewing
d0708da727 add the ability to mark all notifications read. 2013-08-20 08:09:29 -07:00
Rodney Ewing
36f901fbbd used template hooks instead of hardcoding basic_auth functionality into templates 2013-08-16 10:28:48 -07:00
Christopher Allan Webber
4834ef8ec2 Merge remote-tracking branch 'refs/remotes/tsyesika/master'
New oauth tools!  Heck yeah!
2013-08-15 10:34:20 -05:00
tilly-Q
8394febbe1 This has been an update to clean out the code a little bit. The primary change
I made was I added the method has_privilege (which takes a variable amount of
unicode privilege names as an argument) to the User model. This method allowed
for much cleaner checks as to whether or not a user has a privilege. Other-
wise, I also made it impossible for moderators to punish admins. I created a
new url path and three new pages for Users to look at filed reports and the
code of conduct for the mg instance.

=== Made reports on admins not resolvable by moderators:
--\   mediagoblin/moderation/views.py
--\   mediagoblin/templates/mediagoblin/moderation/report.html

=== Created new files for the new pages:
--\   mediagoblin/meta/__init__.py
--\   mediagoblin/meta/routing.py
--\   mediagoblin/meta/views.py
--\   mediagoblin/templates/mediagoblin/meta/code_of_conduct.html
--\   mediagoblin/templates/mediagoblin/meta/reports_details.html
--\   mediagoblin/templates/mediagoblin/meta/reports_panel.html
--\   mediagoblin/routing.py
--\   mediagoblin/static/css/base.css

=== Replaced vestigial methods of checking a user's privilege with the more
====== effective method has_privilege(u'privilege_name'):
--\   mediagoblin/db/models.py
--|   Added in the has_privilege method to the User class

--\   mediagoblin/db/migrations.py
--\   mediagoblin/db/models.py
--\   mediagoblin/decorators.py
--\   mediagoblin/edit/lib.py
--\   mediagoblin/edit/views.py
--\   mediagoblin/gmg_commands/users.py
--\   mediagoblin/moderation/views.py
--\   mediagoblin/templates/mediagoblin/base.html
--\   mediagoblin/templates/mediagoblin/user_pages/collection.html
--\   mediagoblin/templates/mediagoblin/user_pages/media.html
--\   mediagoblin/templates/mediagoblin/user_pages/user.html
--\   mediagoblin/templates/mediagoblin/utils/collection_gallery.html
--\   mediagoblin/user_pages/views.py

=== Minor UI changes
--\   mediagoblin/templates/mediagoblin/moderation/report_panel.html
--\   mediagoblin/templates/mediagoblin/moderation/user.html

=== Other Bugs:
--\   mediagoblin/tools/response.py
--\   mediagoblin/db/migrations.py
2013-08-13 18:38:00 -04:00
Aditi
e5c7e10f02 Create symbolic link for tinymce. 2013-08-10 16:14:04 +05:30