aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/templates
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Move <a> end tagJef van Schendel2012-10-231-1/+2
| |
* | Don't show link to original when the file is an imageJef van Schendel2012-10-231-11/+0
| |
* | Merge branch 'master' of gitorious.org:mediagoblin/mediagoblinChristopher Allan Webber2012-10-223-20/+16
|\ \ | | | | | | | | | | | | | | | | | | | | | # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
| * | Replace dropdown in top right with regular linksJef van Schendel2012-10-211-13/+7
| | |
| * | Move "Add collection" and "Change account settings" links to root.htmlJef van Schendel2012-10-213-7/+9
| | |
* | | Set the user page to two columns wide so we don't have this weird wrapping.Christopher Allan Webber2012-10-221-1/+1
|/ / | | | | | | This is a stopgap solution!
* | Thumbnail styling edits plus edits to the object_gallery (4 columns instead ↵Jef van Schendel2012-10-191-4/+3
| | | | | | | | of 5 by default)
* | Changed a <p/> to </p> in user.html. Removed the <p></p> wrappers in ↵LotusEcho2012-09-242-2/+2
|/ | | | profile.html which was included in user.html.
* Fixed collection sidebar for media_home to user collection.url_for_self ↵Aaron Williamson2012-09-181-9/+3
| | | | instead of incorrectly getting the session user
* Added new files for collectionsAaron Williamson2012-09-189-0/+522
|
* Added basic collection functionalityAaron Williamson2012-09-182-0/+14
|
* Merge remote-tracking branch 'refs/remotes/merge-requests/42'Christopher Allan Webber2012-08-192-0/+6
|\
| * add titles to two pages and fix a typo in docsAleksej2012-08-182-0/+6
| |
* | Merge remote-tracking branch 'refs/remotes/merge-requests/40'Christopher Allan Webber2012-08-192-6/+6
|\ \
| * | use YYYY-MM-DD HH:MM 24-hour format on panelsAleksej2012-08-132-6/+6
| |/
* / added title tags to various pages and marked a string translatableAleksej2012-08-1310-1/+54
|/
* Removing text on frontpage that suggests we have favorites (we don't)Christopher Allan Webber2012-08-041-1/+1
|
* Moving extrahead.html -> extra_head.html because it's easier to readChristopher Allan Webber2012-07-142-1/+1
|
* Allow for an "extrahead" template where themers can include extra css, js, etcChristopher Allan Webber2012-07-142-0/+22
|
* Processing panel improvementsJoar Wandborg2012-07-112-2/+113
| | | | | - Added admin processing panel - Minor fixes on the user processing panel template
* Panel improvementsJoar Wandborg2012-07-111-4/+30
| | | | | | | | | | - Added progress meter for video and audio media types. - Changed the __repr__ method of a MediaEntry to display a bit more useful explanation. - Added a new MediaEntry.state, 'processing', which means that the task is running the processor on the item currently. - Fixed some PEP8 issues in user_pages/views.py - Fixed the ATOM TAG URI to show the correct year.
* Minor improvements to the processing panelJoar Wandborg2012-07-101-1/+12
| | | | | | - It is now possible to actually see what's processing, due to a bug fix where __getitem__ was called on the db model. - Removed DEPRECATED message from the docstring, it wasn't true.
* made the download links consistentJakob Kramer2012-07-074-11/+31
|