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

167 Commits

Author SHA1 Message Date
Jef van Schendel
983aa712ad labels changed to font-weight normal instead of bold, css structure improved 2011-05-13 15:34:44 -05:00
Jef van Schendel
cb1e4a3d1f Added @font-face to css 2011-05-13 15:34:35 -05:00
Jef van Schendel
4a0f823e51 Added header to base.html 2011-05-13 15:34:26 -05:00
Jef van Schendel
8d2a42d435 Changed all headers to <h1> 2011-05-13 15:34:10 -05:00
Jef van Schendel
223b410dce Styled buttons for real this time 2011-05-13 15:33:58 -05:00
Jef van Schendel
8c01ae42e9 Styled input buttons 2011-05-13 15:33:46 -05:00
Jef van Schendel
20aaec5f68 Changed base.html back to old version 2011-05-13 15:33:27 -05:00
Jef van Schendel
881b6e2c32 Fixing changes 2011-05-13 15:33:19 -05:00
Aaron Williamson
1013bdaff2 Minor fomatting fix. 2011-05-13 14:16:35 -04:00
Aaron Williamson
0546833c6e Generate unique slugs for newly submitted images. 2011-05-13 12:18:52 -04:00
Christopher Allan Webber
a8e2812b05 min=0 makes more sense than min=-1 2011-05-12 23:40:47 -05:00
Aaron Williamson
bb49e56f8c On image submission, do not require title. If none entered, default to filename. 2011-05-12 23:38:02 -05:00
Christopher Allan Webber
376e6ef296 locale rather than target_lang in the get parameters 2011-05-12 23:17:53 -05:00
Sebastian Spaeth
7acdbfd364 Improve user homepage 
1) Only consider user's with 'status': 'active'. We don't want to
   display unconfirmed/blocked users, right?
2) Actually query user's media in the view and display on their home
   page.
3) Throw an error 404 if we don't find a valid user, rather than saying,
   "User not found" (from within the template).
4) Pass in medias as media_entries to remain compatible with the 'root'
   page.

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
 2011-05-12 23:10:21 -05:00
Christopher Allan Webber
b77eec653d Load gettext, and load it into the template environment 2011-05-12 22:33:30 -05:00
Christopher Allan Webber
e461b77713 moving mediagoblin.po to a filename that makes sense 2011-05-12 15:26:15 -05:00
Christopher Allan Webber
0e0e3d9aad Separation between setting up the template env and the template loader 
for a glorious future where we have gettext in template context
 2011-05-12 15:17:07 -05:00
Christopher Allan Webber
f62ccaac15 Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin 
Conflicts:
	mediagoblin/util.py
 2011-05-12 14:59:08 -05:00
Christopher Allan Webber
8b28bee4c1 Added some locale determination tools 2011-05-12 14:57:58 -05:00
Christopher Allan Webber
21919313df Fix the email debug inbox 2011-05-12 14:51:45 -05:00
Christopher Allan Webber
2de317f2f3 I probably shouldn't break the main page since we don't have the 
gettext thing in place yet.
 2011-05-12 14:25:28 -05:00
Christopher Allan Webber
23d23dcf6b Moving translations to mediagoblin/translations 2011-05-12 10:22:56 -05:00
Christopher Allan Webber
36bb98fbba Translate the welcome message (extracts successfully!) 2011-05-12 09:48:54 -05:00
Christopher Allan Webber
20c834ffe4 Add the jinja2 extension to the jinja loader 2011-05-12 09:18:53 -05:00
Christopher Allan Webber
7222955fba URLs should end in trailing slashes, or slash redirection doesn't work 2011-05-11 10:26:15 -05:00
Christopher Allan Webber
80c1802440 Removing this horrifying submission test stuff from way back when 2011-05-10 16:35:34 -05:00
Christopher Allan Webber
f624940844 404 appropriately here 2011-05-10 16:25:04 -05:00
Christopher Allan Webber
2eef8761d8 Indenting these templates because I'm pedantic about tag sections 
having their content indented :)
 2011-05-10 16:24:51 -05:00
Sebastian Spaeth
9a16e16ffa Implement simple media detail page 
This patch creates a "homepage" for each media. The URL is
/u/<username>/m/<objID>.

On it we display the media and some details. It is ugly and lacking some
stuff but it works. The only thing left to do is to throw an 404 error
if the <username> and the media uploader don't correspond.

- Also create a user "home page" while at it. It is merely a place
  holder for now though.

- Link from the entries on the homepage, to the media pages, so we
actually find them.

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
 2011-05-10 16:01:43 -05:00
Christopher Allan Webber
9d97145fe4 Merge remote branch 'spaetz/fix_description' 2011-05-08 20:20:19 -05:00
Sebastian Spaeth
ec61f09492 Fix description submission in form handling 
When we submitted an image the description would remain empty. THis was
because of some weird typo in form handling. Get an attribute with
.get('description') and not with .get(['description']). With this patch,
descriptions actually go into the database.

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
 2011-05-09 00:23:12 +02:00
Christopher Allan Webber
cd847fd346 Asbool the email debug mode option 2011-05-08 10:07:39 -05:00
Sebastian Spaeth
34900cce8c Don't escape the verification URL 
In the verification email we would output the URL using HTML encoded
text, so that e.g. & -> &amp;. We don't want that and we know the URL
won't contain user contributed content, so it is safe to turn off HTML
encoding here.

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
 2011-05-08 15:46:35 +02:00
Christopher Allan Webber
a1eb1f6051 Only convert db port if it's there and use asint to do it (better errors if failing) 2011-05-08 07:16:50 -05:00
Christopher Allan Webber
0ce26c370c Merge remote branch 'refs/remotes/spaetz/master' 2011-05-08 07:11:57 -05:00
Christopher Allan Webber
eef100ada5 mgoblin_section.get, not app_config.get (doh) 
My name's Chris Webber and I ignore pyflakes warnings.
 2011-05-08 07:07:08 -05:00
Sebastian Spaeth
19f8a24e41 app.py: Need to pass in port number as 'int' 
When we configured an explicite db_port in mediagoblin.ini, paster would
crash claiming that the port number must be an int. Given that we don't
have a "get_conf_int()" function or something similar (yet?), simply
convert the port number to int before passing it to the mongo Connection
instance.

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
 2011-05-08 11:12:38 +02:00
Christopher Allan Webber
29f3fb7052 Added an email debug mode which, by default, is enabled 2011-05-07 22:45:06 -05:00
Christopher Allan Webber
3eae207c54 [to_email] rather than list(to_email) which makes a nasty series like ['e','m','a','i','l'] 2011-05-07 22:44:37 -05:00
Joar Wandborg
8a6a81bcaa Updated default sender address 
Signed-off-by: Joar Wandborg <git@wandborg.com>
 2011-05-08 02:03:11 +02:00
Joar Wandborg
07a3a69cd4 Added verification email template 
Signed-off-by: Joar Wandborg <git@wandborg.com>
 2011-05-08 02:01:26 +02:00
Joar Wandborg
4942b63711 Removed unused variable 
Signed-off-by: Joar Wandborg <git@wandborg.com>
 2011-05-08 01:58:58 +02:00
Joar Wandborg
4c093e85c7 Made changes according to http://bugs.foocorp.net/issues/271#note-7 
Signed-off-by: Joar Wandborg <git@wandborg.com>
 2011-05-08 00:55:57 +02:00
Joar Wandborg
88bcdcd7d2 Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin 2011-05-07 03:11:36 +02:00
Joar Wandborg
5c42a82c5a Added functionality to send out verification email upon successful registration 
Signed-off-by: Joar Wandborg <git@wandborg.com>
 2011-05-07 03:08:09 +02:00
Joar Wandborg
b16ebe0e13 Changed the method used to generate uuids for verification_key, this one works, thanks paroneayea 
Signed-off-by: Joar Wandborg <git@wandborg.com>
 2011-05-07 02:30:35 +02:00
Joar Wandborg
85e1bc316e mediagoblin.util.send_email now supports both list() and string() in the 'to_addrs' parameter 
Signed-off-by: Joar Wandborg <git@wandborg.com>
 2011-05-07 00:57:39 +02:00
Joar Wandborg
67e63926f9 Fixed bug in models.py:User that caused all users created by the same python process to have the same verification_key value 
Signed-off-by: Joar Wandborg <git@wandborg.com>
 2011-05-07 00:55:32 +02:00
Christopher Allan Webber
4c1e752a08 Actually display submitted stuff on the mainpage. Crappy, but working! 2011-05-06 10:01:26 -05:00
Christopher Allan Webber
12b6ecac0f Erk, we didn't save the state right before 2011-05-06 10:01:11 -05:00