heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,235 Commits 1 Branch 0 Tags
Commit Graph

5235 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jef van Schendel
8dc4381032 Style navigation buttons 2011-07-03 23:04:09 +02:00
Jef van Schendel
e854a1285c First push with 180px wide thumbnails 2011-07-03 22:29:36 +02:00
Jef van Schendel
18d9287aa9 Switched over to 960_16_col. This may break a bunch of stuff. If you find something that is broken, slap me. 2011-07-03 21:37:21 +02:00
Jef van Schendel
1344821daf Added reset.css and text.css from 960.gs. This might shake up a few styles! 2011-07-03 21:20:09 +02:00
Jef van Schendel
0b69a78f73 Put file input form at the top of submission form 2011-07-03 21:12:22 +02:00
Christopher Allan Webber
668831216a Merge remote branch 'remotes/jwandborg/f409-redirect_to_user_page_upon_submit' 2011-07-03 09:43:39 -05:00
Christopher Allan Webber
7c42cdf739 class="media_image" accidentally added back during 400 merge. Fixing. 2011-07-03 09:42:45 -05:00
Christopher Allan Webber
b86bedf9ea Switching single-quoted strings to double-quote to avoid escaping the apostrophe.. :) 2011-07-03 09:29:09 -05:00
Christopher Allan Webber
96a2c36642 Caution an admin when they're editing someone else's media. 2011-07-03 09:26:40 -05:00
Christopher Allan Webber
7a44bb16db user_gallery_url -> {{ user_gallery_url }} ... How embarassing. 2011-07-03 09:21:24 -05:00
Christopher Allan Webber
8c9b1b2c14 Merge remote branch 'remotes/gullydwarf-cfdv/b388+b391_edit_profile_link_on_user_page' 2011-07-03 08:31:35 -05:00
Caleb Forbes Davis V
a0cf14fe7c uses new 'username' variable in querystring to specify the user to edit 
Previously, this view only allowed editing of the logged-in user. Now you
  can specify the user to edit in the querystring. If you are an admin the
  view allows you to edit any user's profile, with a warning message. The
  warning only shows up if the admin is editing another user's profile.

Make sure to pass the username to this view at every step in the process
 2011-07-03 02:56:00 -05:00
Caleb Forbes Davis V
e192d7b7a5 allows admins to edit user media 2011-07-03 02:41:39 -05:00
Caleb Forbes Davis V
42de4c5379 moves edit profile link to user page 2011-07-03 02:37:19 -05:00
Joar Wandborg
4dc7444119 Feature #409 - Submitting an image should redirect you back to user's 
page w/ a message

*   Successful submission redirects to the logged in user's page
    (your own, presumably).
*   "Woohoo! Submitted!" is launched into the tube of session messages
    to appear on next pageload. If you're not aborting in the window
    of 210ms it takes for the client to respond to the 302 and load
    the logged in user's/your page that is, YMMV.
 2011-07-03 07:50:35 +02:00
Joar Wandborg
380ac094f6 Removed debug code, erroneously included in my last commit 2011-07-03 06:37:40 +02:00
Joar Wandborg
2c9e635ae2 Feature #400 - Resize images to fit on page - Additions 
*   `migrations.py`
    *   Removed empty line
    *   Added empty line
*   `models.py`
    *   Added `MediaEntry.get_display_media()` helper function
*   `process_media.__init__.py`
    *	Updated `process_media_initial()`
    	*   Renamed `main` => `original`.
	*   Added condition to `medium`, it's only created if the original
	    dimensions exceed the MEDIUM_SIZE dimensions.
*   `media.html`
    *	The image tag is now populated by `MediaEntry.get_display_media()`
*   `util.py`
    *	Added `DISPLAY_IMAGE_FETCHING_ORDER`, used by `MediaEntry.get_display_media()`
 2011-07-03 05:46:00 +02:00
Christopher Allan Webber
5949be9ad6 Make pagination on user profile point to the user gallery 
This required a couple of changes:
 - making a new render_pagination macro
 - switching things over to use that
 2011-07-02 22:09:46 -05:00
Christopher Allan Webber
d729012dd9 Just some spacing changes in profile.html 2011-07-02 21:31:25 -05:00
Christopher Allan Webber
30d6ecf6ed We should link to the user's gallery, not the logged in person's gallery. 2011-07-02 21:31:04 -05:00
Christopher Allan Webber
230e1bd770 Merge remote branch 'remotes/gullydwarf-cfdv/f401_prev_next_media_nav' 
Conflicts:
	mediagoblin/db/models.py
	mediagoblin/templates/mediagoblin/user_pages/media.html
 2011-07-02 21:16:39 -05:00
Christopher Allan Webber
68b86d7ce9 Let users write their own config and paste files w/o affecting git 2011-07-02 19:01:55 -05:00
Christopher Allan Webber
cd1e3ca940 Merge remote branch 'remotes/elrond/idea/lazyserver' 2011-07-02 19:00:58 -05:00
Christopher Allan Webber
d8db3f112e Merge remote branch 'remotes/jwandborg/feature_400-resize_images_to_fit_page' 
Conflicts:
	mediagoblin/templates/mediagoblin/user_pages/media.html
 2011-07-02 19:00:01 -05:00
Elrond
472a83879d Improve lazyserver.sh to handle args 
Run "./lazyserver.sh -h" to learn more.
 2011-07-03 01:57:08 +02:00
Christopher Allan Webber
841110a75d Only show pagination if we have pages to show 2011-07-02 18:31:02 -05:00
Joar Wandborg
93214d8e02 Feature #400 - Resize images to fit on page 
*   `mediagoblin.process_media.__init__`
    *   Added `medium` size image conversion
    *  	Updated `thumbnail` conversion to use `queued_filename` instead
        of `queued_file`
*   `media.html`
    *   If there exists a `medium` size for the `MediaEntry`, it will
        display instead of the original `main` image.
 2011-07-03 01:30:07 +02:00
Christopher Allan Webber
f9f135647c Issue 406: media_details template deprecated. Removing! 2011-07-02 17:49:51 -05:00
Christopher Allan Webber
316855fa44 Merge remote branch 'remotes/gullydwarf-cfdv/b404_edit_profile_navfix' 2011-07-02 17:46:26 -05:00
Christopher Allan Webber
a24dbd451c Note from Chris Webber prefacing Elrond's DB abstraction idea. 2011-07-02 17:05:13 -05:00
Christopher Allan Webber
c0d532f04e Merge remote branch 'remotes/elrond/idea/db_doc' 2011-07-02 17:01:43 -05:00
Christopher Allan Webber
5d5eb6c331 Merge remote branch 'remotes/elrond/dev/init' 2011-07-02 15:48:49 -05:00
Elrond
421129b6bb Move config.py to init/ 
Some simple changes needed to do that.

The interesting question left:
Should config_spec.ini also be moved?
 2011-07-02 22:40:19 +02:00
Christopher Allan Webber
2110408f44 Merge remote branch 'remotes/jwandborg/feature_362-simple_comments-acts_on_feedback' 
Conflicts:
	mediagoblin/templates/mediagoblin/user_pages/media.html
 2011-07-02 14:39:35 -05:00
Christopher Allan Webber
29f9df7b27 Removing that 'temporarily, an "image gallery" that isn't one really ;)' text 2011-07-02 14:34:39 -05:00
Christopher Allan Webber
082a675fcd the delete text should be flush against the image since the edit text is 2011-07-02 14:32:54 -05:00
Christopher Allan Webber
6f65e9eb90 More spacing / newline changes to media.html 2011-07-02 14:30:33 -05:00
Christopher Allan Webber
f6c49c5e62 Not sure what these fields are here commented out for... removing 2011-07-02 14:29:47 -05:00
Christopher Allan Webber
ab6fffedf8 Cleaning up some indentation in media.html 2011-07-02 14:28:57 -05:00
Christopher Allan Webber
bd9e3bbc2a images/iconFoo.png filenames -> icon/icon_foo.png 
I have a thing against mixedCase :)
 2011-07-02 14:26:18 -05:00
Christopher Allan Webber
b28e91ce18 Merge remote branch 'remotes/schendje/master' 2011-07-02 14:13:48 -05:00
Elrond
42ef819cbb Move get_jinja_loader to init submodule. 2011-07-02 20:50:31 +02:00
Elrond
073b61fe53 Move mediagoblin.celery_setup -> mediagoblin.init.celery 
As the first target of the new .init. submodule move
celery_setup there. Quite straight forward, just a lot of
places to change.
 2011-07-02 20:50:23 +02:00
Elrond
1b579e18d8 Start mediagoblin.init 2011-07-02 20:25:09 +02:00
Caleb Forbes Davis V
9c0fe63fad adds previous and next links in the sidebar 
Feature #401 - previous/next navigation on media pages
* media.html includes a new prev_next.html template containing the links
* prev_next.html calls functions added to the media model to retrieve
  the appropriate objects from the database, formatted with urlgen
* a small change to util.py brings ASCENDING into the mix
 2011-07-02 06:15:58 -05:00
Caleb Forbes Davis V
d9ed098e74 Bug #404 - Successful profile edit is successful! 
user is notified of successful profile edit w/o extra navigation
 2011-07-01 22:33:54 -05:00
Joar Wandborg
fe5f8a281a Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin 2011-07-01 22:02:58 +02:00
Jef van Schendel
bf332e827e Tiny pagination style changes 2011-07-01 20:14:38 +02:00
Jef van Schendel
c26601a8a6 Remove dotted_line style from css 2011-07-01 20:09:51 +02:00
Jef van Schendel
f188463b46 Fix tiny pagination error: missing end tag 2011-07-01 20:08:12 +02:00