584 Commits

Author SHA1 Message Date
Caleb Forbes Davis V
a8923a7da3 removes messages.add_message from the global template context
templates don't add messages. views are responsible for that.
2011-06-27 23:49:57 -05:00
Caleb Forbes Davis V
2264670357 adds message queue
Feature #368 - messaging framework
* message levels are debug, info, success, warning, and error
* display mechanism - base.html includes messages.html for now
* fetch_messages and add_message are available to all templates
  using jinja2 environment.globals
* messages are displayed and cleared. no persistence
2011-06-27 13:25:55 -05:00
Christopher Allan Webber
e1d9e1d139 Reordering the uploaded on/by and description sections of media display template 2011-06-25 14:32:31 -05:00
Christopher Allan Webber
d4a7a03ce7 Align images in a gallery to the center 2011-06-25 13:15:15 -05:00
Christopher Allan Webber
fcb3166270 Just adjusting indentation a little bit in the base template. 2011-06-25 13:10:46 -05:00
Christopher Allan Webber
4765a52b1f Merge remote branch 'remotes/gullydwarf-cfdv/is330'
Conflicts:
	mediagoblin/templates/mediagoblin/user_pages/gallery.html
2011-06-25 13:08:04 -05:00
Christopher Allan Webber
f7b7511b7b Make the width of these fields 100% rather than providing a specific pixel width. 2011-06-25 12:55:42 -05:00
Christopher Allan Webber
426685e088 Put the thumbnail on the edit details part on the top and center 2011-06-25 00:28:03 -05:00
Christopher Allan Webber
39c76f30f0 Setting height for media thumbnail to also 200px
Not sure why height wasn't at 200px but anyway not having at 200px
means some images would hit overlap.
2011-06-24 23:53:31 -05:00
Christopher Allan Webber
353f927e9f Adjust the width of the fields on the form submission
Did several things, including:

 - Call the individual form field rendering macros instead of the auto
   whole-form renderer so we get better control over the TextArea
 - Use the textarea specific form field rendering macro
 - Adds textarea styling to the css
 - Sets the input, textarea styling to be 460 px wide (the width of
   the form section, not including padding)
2011-06-24 23:49:37 -05:00
Christopher Allan Webber
528f9acd23 Separates out the field rendering part from the whole form rendering macro
Also adds a textarea-specific version that renders rows and cols as
part of the input.
2011-06-24 23:46:11 -05:00
Jef van Schendel
9f661642ef Implement basic footer 2011-06-24 21:03:05 +02:00
Jef van Schendel
c397b962de Remove excess grids, change CSS to center forms 2011-06-23 17:39:13 +02:00
Jef van Schendel
dd0d7f24bc Add <br /> for correct text layout 2011-06-23 16:47:27 +02:00
Jef van Schendel
454835832c Submit form should not have edit_box class 2011-06-23 16:40:33 +02:00
Jef van Schendel
b9bce89f6f Make several small changes to wording and top bar links 2011-06-23 16:38:55 +02:00
Christopher Allan Webber
d94b84b437 Merge remote branch 'remotes/schendje/960-grid-system' 2011-06-22 22:21:08 -05:00
Christopher Allan Webber
64201d12c3 Slightly clearer message about email marked as verified w/ adduser gmg command 2011-06-22 22:17:58 -05:00
Christopher Allan Webber
a3fae1bd07 Setting status to active when adding users with ./bin/gmg adduser 2011-06-22 22:16:50 -05:00
Christopher Allan Webber
8781ddb541 Making arguments positional and removing the "usage" functions
All these arguments were required and might as well be positional
thusly.  If you don't provide all required positional arguments,
argparser will correct you and request usage.
2011-06-22 22:16:37 -05:00
Christopher Allan Webber
7f4b44710b No need to describe usage of subcommands, gmg subcommand --help does that 2011-06-22 22:09:11 -05:00
Alejandro Villanueva
96108ea285 Adding new function to gmg_commands, adduser,makeadmin and changepw issue 373 2011-06-22 21:49:06 -05:00
Jef van Schendel
f7bcfafff0 Switch css over to 960.gs. If I did everything right, things should look exactly the same. 2011-06-23 02:09:00 +02:00
Christopher Allan Webber
54de443a6a Check on media['uploader']'s id rather than the username
This skips making an extra query to retrieve the uploader object and
also checks on the canonical ID, which is probably good (even if
indexing should ensure uniqueness there).
2011-06-22 13:57:34 -05:00
Christopher Allan Webber
3a2b22e346 Merge remote branch 'remotes/gullydwarf-cfdv/is388_only_media_owner_edits' 2011-06-22 13:54:14 -05:00
Christopher Allan Webber
7577b7dfbe Two not three ways to contribute now, reflecting that in docs :) 2011-06-22 12:38:08 -05:00
Caleb Forbes Davis V
ca9c7a07b2 adds conditional for display of media edit link 2011-06-22 12:13:29 -05:00
Jef van Schendel
b4c0aeb686 Add updates background images 2011-06-22 17:48:20 +02:00
Jef van Schendel
1db7bed64b Several small UI changes to edit profile page: moved header, changed form wording, changed css class 2011-06-22 17:02:28 +02:00
Jef van Schendel
7f8a70ef25 Merge remote-tracking branch 'gitorious/master' 2011-06-22 17:01:20 +02:00
Christopher Allan Webber
cf383901a9 Merge remote branch 'remotes/elrond/idea/invalidid' 2011-06-22 09:52:13 -05:00
Jef van Schendel
69a303a84c Merge remote-tracking branch 'gitorious/master' 2011-06-22 15:32:06 +02:00
Christopher Allan Webber
d220f87c12 I don't think we need the username to be part of the profile editing URL 2011-06-21 23:26:45 -05:00
Christopher Allan Webber
46fd661e34 Adding an extra space between function definitions 2011-06-21 23:26:18 -05:00
Christopher Allan Webber
b9f097a6f9 Indenting some sections between if / else blocks in root.html 2011-06-21 23:25:15 -05:00
Christopher Allan Webber
3208bea54c Merge remote branch 'refs/remotes/gullydwarf-cfdv/is315' 2011-06-21 23:22:16 -05:00
Christopher Allan Webber
29f1333e72 Extra checks so that we don't even RUN tests unless the right celery environ set 2011-06-21 17:02:49 -05:00
Christopher Allan Webber
26c61fc843 Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin 2011-06-21 16:06:09 -05:00
Christopher Allan Webber
cfd2cbf3dd Make sure we *ONLY* ever kill the test database, EVER. 2011-06-21 16:04:44 -05:00
Jef van Schendel
3efb084809 Merge remote-tracking branch 'gitorious/master' 2011-06-21 19:13:07 +02:00
Will Kahn-Greene
f439193628 333. Adds explanation of command lines; tweaks format-patch line
* Adds explanation of command lines and their arguments (gullydwarf's
  suggestion).
* Switched the ``git format-patch ...`` line from using -o patches to
  using --stdout.  This creates a single patch file and is (probably)
  easier to deal with.
* Fixed a typo.
* Adds toc to top of mediagoblin chapter
2011-06-21 12:32:43 -04:00
Christopher Allan Webber
4fd18da0a8 Also fix clean_html so that it doesn't barf on an empty string. 2011-06-21 08:20:05 -05:00
Jef van Schendel
4e5a55787b Merge remote-tracking branch 'gitorious/master' 2011-06-21 11:22:31 +02:00
cfdv
0472653ee4 assigns migration steps to User database objects
adds the migration_handler to the User db class, connecting the
migration steps in ../db/migrations.py to the migration code in
gmg_commands
2011-06-20 22:48:25 -05:00
Christopher Allan Webber
a2c37d0a78 Only migrate to description_html if description also exists. 2011-06-20 21:02:46 -05:00
Christopher Allan Webber
8268884653 Fix cleaned_markdown_conversion so that it doesn't bork on empty strings
Basically, clean_html would throw an error on '', so we just return ''
"if not text"
2011-06-20 21:01:05 -05:00
cfdv
17bb7c388b removes unecessary dependence on existence of username for User migration01, + fix whitespace issues 2011-06-20 19:28:02 -05:00
cfdv
e36ecab093 adds accommmodations for migration of fields in User: bio and url 2011-06-20 13:07:15 -05:00
cfdv
78c0744077 Merge remote-tracking branch 'origin/master' into is315 2011-06-20 12:50:44 -05:00
Jef van Schendel
2d1f91cc41 Merge remote-tracking branch 'gitorious/master' 2011-06-20 16:33:14 +02:00