aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/templates
Commit message (Collapse)AuthorAgeFilesLines
...
* | Add "Browse collections" link to profile pagesJef van Schendel2013-01-171-0/+6
| |
* | adding back dropdown.js now that we have, well, a dropdown again :)Christopher Allan Webber2013-01-171-0/+3
| |
* | Merge remote-tracking branch 'refs/remotes/origin/533-new-dropdown'Christopher Allan Webber2013-01-172-36/+41
|\ \ | | | | | | | | | | | | | | | Conflicts: mediagoblin/templates/mediagoblin/base.html mediagoblin/templates/mediagoblin/root.html
| * | CSS edits to dropdown menu; added log out button for unverified usersJef van Schendel2013-01-171-2/+4
| | |
| * | Fix small user errorJef van Schendel2012-12-021-1/+1
| | |
| * | Give elements proper, more descriptive class namesJef van Schendel2012-12-021-3/+3
| | |
| * | Several edits to header dropdown:Jef van Schendel2012-12-021-8/+6
| | | | | | | | | | | | | | | | | | | | | - Style the up/down arrow as a button - Remove the Actions header - Remove redundant original "Add media" button - Style "Add media" and "Create new collection" links as buttons
| * | First commit to add header dropdownJef van Schendel2012-12-022-27/+31
| | |
* | | Change position of "Delete account" link, put it below the formJef van Schendel2013-01-171-6/+4
| | |
* | | Better "delete my account" placementSebastian Spaeth2013-01-171-1/+6
| | | | | | | | | | | | | | | | | | | | | Improve the "delete my account" link location by not placing it outside the main content bar. It still might require more tweaks. Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
* | | Allowing to delete a user account (#302)Sebastian Spaeth2013-01-172-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a "Delete user account" template and link to it from the user account settings page. Create a delete_account function and fill in most blanks. We can now successfully delete our own account. Thanks to Elrond for catching a stray csrf_exempt in a previous iteration of this patch. Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
* | | Merge remote-tracking branch 'refs/remotes/elrond/misc/use_media_id'Christopher Allan Webber2013-01-163-5/+5
|\ \ \
| * | | Start to use the media_id in "admin" URLs.Elrond2013-01-113-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have a bunch of URLs that are more for internal use. At least they're definitely not intended to be posted somewhere for long term useage. When those things affect a media, it's much better to reference the media by its id. This can't change, ever. This is better for races. Like someone posting a comment while the owner corrects a typo in the slug.
* | | | collection browsing: rename view/template user_collections -> collection_listStefano Zacchiroli2013-01-152-1/+1
| | | | | | | | | | | | | | | | | | | | Rationale, avoid confusion between views user_collection and user_collections (note trailing "s"). Ditto for the collection(s).html templates.
* | | | collection browsing: drop atom feed from page templateStefano Zacchiroli2013-01-151-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | rationale: it refers to something else than a "collection feed" thanks to Elrond der Elbenfuerst for pointing this out
* | | | collections: add support to browse existing collectionsStefano Zacchiroli2013-01-152-3/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - add a route at /u/<user>/collections/ (note trailing 's') that lists all existing collections - move there the "Create new collection" link, if the user is logged in - add a new link "Browse collections" from root.html
* | | | #571: Fixed. Display collection description with Markdown formatting.Tiberiu C. Turbureanu2013-01-151-1/+3
| | | |
* | | | Move logo part into bits/logo.htmlElrond2013-01-132-7/+26
|/ / / | | | | | | | | | | | | To make it easier for themers to replace the logo, move it out into its own logo.html.
* | | Enable /u/USERNAME/edit/ pattern #588Sebastian Spaeth2013-01-092-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | Transition from the inconsistent /edit/profile/?username=FOO to the nicer /u/FOO/edit/. The old pattern will still work and redirects to the new URL. Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
* | | RIP out mongoSebastian Spaeth2012-12-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since sqlalchemy is providing our database abstraction and we have moved away from Mongo as the underlying database, it is now time to simplify things and rip out mongo. This provides the bulk of the changes, and can stand on its own. There are some followup tasks that can be done, such as removing now unneeded abstraction layers, e.g. db.sql.fake.py
* | | Merge branch '512_bump_video_js'Sebastian Spaeth2012-12-251-25/+21
|\ \ \
| * | | Bump bundled video.js to v3.2.3 (#512)Sebastian Spaeth2012-12-251-25/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is nothing inherently wrong with the currently bundled version, but the last one was uploaded in March 2012 and there have been upstream releases since. So bump to the latest available release 3.2.3. Might help with the reported issue 512 of an unresponsive video player. Do note that the Flash fallback option is removed. If we decide this should be added it is easy to add it back. We still use our own customized theme. Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
* | | | Move DBModel._id -> DBModel.idSebastian Spaeth2012-12-2111-27/+27
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were refering to model._id in most of the code base as this is what Mongo uses. However, each use of _id required a) fixup of queries: e.g. what we did in our find() and find_one() functions moving all '_id' to 'id'. It also required using AliasFields to make the ._id attribute available. This all means lots of superfluous fixing and transitioning in a SQL world. It will also not work in the long run. Much newer code already refers to the objects by model.id (e.g. in the oauth plugin), which will break with Mongo. So let's be honest, rip out the _id mongoism and live with .id as the one canonical way to address objects. This commit modifies all users and providers of model._id to use model.id instead. This patch works with or without Mongo removed first, but will break Mongo usage (even more than before) I have not bothered to fixup db.mongo.* and db.sql.convert (which converts from Mongo to SQL) Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
* | | Remove collection_thumbnail styling, so collection thumbnails are styled the ↵Jef van Schendel2012-12-161-3/+1
| | | | | | | | | | | | same as other thumbnails
* | | Make "add media to collection" a normal <img/>Elrond2012-12-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This button used to be a css style <a href=...> </a> (note: No contents for the <a>). Using this approach has various drawbacks. Most notably: - Not clickable in text mode browsers - Possibly getting marked as a hidden (spam) link - No alt attribute So replaced with a real <img/>. I have no idea what to put in the alt attribute.
* | | Do not translate just a variable expansion.Elrond2012-12-121-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | No point in translating <p>{{ var }}</p>. Really. This does not hurt the string freeze, as it removes a translateable string. So any translations of this string are just well ... usefuless afterwards.
* | | Fix spacing in links to attachment files.Elrond2012-12-122-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | We had """<a href="abc.dat"> abc.dat</a>""" (note the apace). And this space is being rendered as a link by browsers. This looks strange, really. So fix the spacing.
* | | Setting the user profile back to 3 columns wide!Christopher Allan Webber2012-12-111-1/+1
| | | | | | | | | | | | Previously this was set to two when the spacing between thumbs got borkified.
* | | Remove gridify_*Sebastian Spaeth2012-12-042-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We injected a gridify_list and gridify_cursor function into each jinja2 template that we render. This was used to split the list of media_entries into batches of 5 for nicer table columns. However, jinja2 has a nice |batch filter built in that does the job for us just as well with less code (on our side) Less code=good so let's merge this one. Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
* | | We arean't using header_dropdown.js anymore because the dropdown is gone!Christopher Allan Webber2012-12-041-2/+0
| | |
* | | Moving thingiview.js into extlib/Christopher Allan Webber2012-12-031-4/+4
| | |
* | | Removed debug info from the sidebar.Aeva Ntsc2012-12-031-9/+4
| | |
* | | tweaking the templateAeva Ntsc2012-12-031-1/+6
| | |
* | | Disabled thingiview for obj models, since thingiview's support for them ↵Aeva Ntsc2012-12-031-0/+2
| | | | | | | | | | | | seems to be broken.
* | | Updated the template for viewing stl models.Aeva Ntsc2012-12-031-28/+102
| | |
* | | made 3d viewer a little cleanerAeva Ntsc2012-12-031-11/+22
| | |
* | | Added a rudimentary template for the stl/obj viewer.Aeva Ntsc2012-12-031-0/+63
| | |
* | | Fix translations around.Elrond2012-12-033-10/+18
| | | | | | | | | | | | | | | | | | | | | This includes: - Mark more strings for translation - Don't mark html-only nonsense for translation - Mark a better part for translation.
* | | Go back to pre-login URL after loging inSebastian Spaeth2012-12-031-1/+2
|/ / | | | | | | | | | | | | | | Simply append the current URL (sans querystring) as a ?next= parameter to the login URL. This will always take us back to the original page where we were pre-login. Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
* | Implement generic error pagesSebastian Spaeth2012-11-291-7/+4
| | | | | | | | | | | | | | | | | | | | | | Rather than having a 404.html, a 403.html, a 500.html,... we have a generic error.html template that we pass in an error code, a title and a (html'ish) error message. Implement the common render_404 and render_403 shortcuts. More exotic cases can be achieved by the generic render_error function. Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
* | Autofocus the username field on user creationSebastian Spaeth2012-11-261-0/+2
| | | | | | | | | | | | | | | | | | On a page with the single purpose to enter new user data, we should auto-focus the username field. It is very annoying to have to click in that field before starting to type. Theoretically, there is the "autofocus" attribute in html5, but IE does not support that. Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
* | Merge remote-tracking branch 'elrond/for-schendje'Christopher Allan Webber2012-11-262-7/+27
|\ \
| * | Some small template changesElrond2012-11-262-7/+27
| | | | | | | | | | | | | | | | | | | | | 1) Change the "dashboard": - Add a bunch of new links: Processing panel, Add media - Use <ul>+<li> for the *list* of possible actions 2) Add a title attribute to the "add media to collection" link
* | | Merge remote-tracking branch 'remotes/spaetz/410_OSM_attrib_v2'Christopher Allan Webber2012-11-261-0/+15
|\ \ \ | |/ / |/| |
| * | Pop up OpenStreetMap license on demand (#410)Sebastian Spaeth2012-11-161-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only a short blurb "see map license" in the small map which will pop up the full license text via jquery when clicked. Adapt the license text as recommended by OpenStreetMap http://www.openstreetmap.org/copyright and link there. The disadvantage is that this only works when Javascript is enabled, but as the map only works when Javascript is enabled in the first place, this should not be too much of a limitation. TODO: Our esteemed web designer needs to have a look at the desired color style for this. Right now, I simply placed it in the message_warning class. This might want fine-tuning. Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
* | | Marking "attachment" stuff for translation (thanks for catching AVRS)Christopher Allan Webber2012-11-241-2/+2
|/ /
* | Simplify/Robustify the thumbnail URL usage in templatesSebastian Spaeth2012-11-157-24/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So far templates required a very complex blurb to simply insert a thumbnail URL, exposing much of the internal logic to the template designer. In addition, we would fail with an error if for some reason the media_files['thumb'] entry was never populated. This adds the MediaEntry.thumb_url property that template designers can simply use. It will do the right thing, either fetching the proper thumbnail or hand back a generic icon specified in a media's MEDIA_MANAGER as "default_thumb". Add an image default fallback icon (stolen from Tangos, which are Public Domain since version 0.8.90 as I understand) since the one we referred to was not existing. Perhaps, a "broken image" icon would be better, but I'll leave that to our capable designers. All templates have been modified to make use of the new thumb_url function. Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
* | Merge remote-tracking branch ↵Christopher Allan Webber2012-11-131-4/+8
|\ \ | |/ |/| | | 'refs/remotes/spaetz/trac_475_email_notification_checkbox'
| * Don't put checkbox text on separate line (#475)LotusEcho2012-11-131-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manually render the "notify me" checkbox line in the account settings to not put the form label as a heading but in the same line as the checkbox. Edit forms.py to use the label attribute for the caption. Original patch modified by Sebastian Spaeth to 1) not translate the checkbox label in the template, it is translated in forms.py already. 2) Simplify the HTML, manually constructing the <label> tag is not necessary, WTforms does it automatically. Author: LotusEcho <Emma.C.Echo@gmail.com> Modified-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
* | Change to 5 thumbnails per rowJef van Schendel2012-11-011-2/+2
| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-06 12:41:57 +0000