diff options
| -rw-r--r-- | mediagoblin/static/css/base.css | 66 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/edit/edit.html | 12 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/submit/start.html | 2 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/utils/object_gallery.html | 2 |
4 files changed, 51 insertions, 31 deletions
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 5d928b9a..1d04fc73 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -69,34 +69,39 @@ a.mediagoblin_logo:hover { float:right; } +/* common website elements */ + +.dotted_line { + width:100%; + height:0px; + border-bottom: dotted 1px #5f5f5f; + position:absolute; + left:0px; + margin-top:-20px; +} + .button { font-family:'Carter One', arial, serif; height:32px; min-width:99px; background-color:#86d4b1; + background-image: -webkit-gradient(linear, left top, left bottom, from(#86d4b1), to(#62caa2)); + background-image: -webkit-linear-gradient(top, #86d4b1, #62caa2); + background-image: -moz-linear-gradient(top, #86d4b1, #62caa2); + background-image: -ms-linear-gradient(top, #86d4b1, #62caa2); + background-image: -o-linear-gradient(top, #86d4b1, #62caa2); + background-image: linear-gradient(top, #86d4b1, #62caa2); box-shadow:0px 0px 4px #000; border-radius:5px; border:none; color:#272727; - margin:10px; + margin:10px 0px 10px 15px; font-size:1em; - display:block; text-align:center; padding-left:11px; padding-right:11px; } -/* common website elements */ - -.dotted_line { - width:100%; - height:0px; - border-bottom: dotted 1px #5f5f5f; - position:absolute; - left:0px; - margin-top:-20px; -} - /* forms */ .form_box { @@ -104,8 +109,9 @@ a.mediagoblin_logo:hover { margin-left:auto; margin-right:auto; background-color:#393939; - padding:0px 83px 30px 83px; - border-top:5px solid #d49086; + background-image:url("../images/background_lines.png"); + background-repeat:repeat-x; + padding:1px 83px 30px 83px; font-size:18px; } @@ -113,6 +119,11 @@ a.mediagoblin_logo:hover { width:600px; } +.edit_box { + width:600px; + background-image:url("../images/background_edit.png"); +} + .form_box h1 { font-size:28px; } @@ -139,6 +150,10 @@ a.mediagoblin_logo:hover { margin-bottom:8px; } +.form_submit_buttons { + text-align:right; +} + /* media pages */ img.media_image { @@ -147,14 +162,17 @@ img.media_image { margin-right:auto; } +ul.media_thumbnail { + padding:0px; +} + li.media_thumbnail { - width: 200px; - min-height: 250px; - display: -moz-inline-stack; - display: inline-block; - vertical-align: top; - margin: 5px; - zoom: 1; - *display: inline; - _height: 250px; + width:200px; + height:133px; + display:-moz-inline-stack; + display:inline-block; + vertical-align:top; + margin:0px 10px 10px 0px; + zoom:1; +. *display:inline; } diff --git a/mediagoblin/templates/mediagoblin/edit/edit.html b/mediagoblin/templates/mediagoblin/edit/edit.html index 295d57eb..51d0341d 100644 --- a/mediagoblin/templates/mediagoblin/edit/edit.html +++ b/mediagoblin/templates/mediagoblin/edit/edit.html @@ -20,19 +20,21 @@ {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %} {% block mediagoblin_content %} - <h1>Edit details for {{ media.title }}</h1> <form action="{{ request.urlgen('mediagoblin.edit.edit_media', user= media.uploader().username, media= media._id) }}" method="POST" enctype="multipart/form-data"> - <div class="submit_box form_box"> + <div class="edit_box form_box"> + <h1>Editing {{ media.title }}</h1> {{ wtforms_util.render_divs(form) }} <div class="form_submit_buttons"> - <input type="submit" value="submit" class="button" /> + <a href="{{ media.url_for_self(request.urlgen) }}">Cancel</a> + <input type="submit" value="Save changes" class="button" /> </div> + <img src="{{ request.app.public_store.file_url( + media['media_files']['thumb']) }}" /> </div> </form> - <img src="{{ request.app.public_store.file_url( - media['media_files']['thumb']) }}" /> + {% endblock %} diff --git a/mediagoblin/templates/mediagoblin/submit/start.html b/mediagoblin/templates/mediagoblin/submit/start.html index 75c31df4..fe1f3369 100644 --- a/mediagoblin/templates/mediagoblin/submit/start.html +++ b/mediagoblin/templates/mediagoblin/submit/start.html @@ -27,7 +27,7 @@ <h1>Submit yer media</h1> {{ wtforms_util.render_divs(submit_form) }} <div class="form_submit_buttons"> - <input type="submit" value="submit" class="button" /> + <input type="submit" value="Submit" class="button" /> </div> </div> </form> diff --git a/mediagoblin/templates/mediagoblin/utils/object_gallery.html b/mediagoblin/templates/mediagoblin/utils/object_gallery.html index c9c3e0db..8c88c174 100644 --- a/mediagoblin/templates/mediagoblin/utils/object_gallery.html +++ b/mediagoblin/templates/mediagoblin/utils/object_gallery.html @@ -19,7 +19,7 @@ {% block object_gallery_content -%} <div> {% if media_entries %} - <ul> + <ul class="media_thumbnail"> {% for entry in media_entries %} <li class="media_thumbnail"> <a href="{{ entry.url_for_self(request.urlgen) }}"> |