From 101b76c16ef2d7af846d84b21e94ee695db70cc3 Mon Sep 17 00:00:00 2001 From: karen menezes Date: Fri, 4 Jan 2013 01:28:15 -0800 Subject: [PATCH 1/3] main view page looks better now --- itf/static/css/noel/inner-details.css | 5 +++-- itf/static/css/noel/inner.css | 15 +++++++++++++-- itf/templates/mediagallery/view.html | 4 ++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/itf/static/css/noel/inner-details.css b/itf/static/css/noel/inner-details.css index 3440cf3..2c68b0c 100755 --- a/itf/static/css/noel/inner-details.css +++ b/itf/static/css/noel/inner-details.css @@ -73,9 +73,10 @@ display:block;} .hideText {display:none;} -#lightbox h1 { - font-size: 120%; +.lightboxHeading { + font-size: 130%; padding: 10px; + text-align: center; } #imagesContainer { diff --git a/itf/static/css/noel/inner.css b/itf/static/css/noel/inner.css index 2a11462..68f363d 100755 --- a/itf/static/css/noel/inner.css +++ b/itf/static/css/noel/inner.css @@ -580,7 +580,17 @@ margin-top:6px} {position:relative; height:100%;} -.lightboxNext, .lightboxPrev { + +.closinglightbox { + display: block; + text-align: center; + text-decoration: none; + left: 0; + right: 0; + margin: 0 auto; +} + +.closinglightbox, .lightboxNext, .lightboxPrev { font-size:14px; color:#F7BD00; font-weight:bold; @@ -649,7 +659,8 @@ border-top:1px solid #d3d3d3; border-bottom:1px solid #d3d3d3; -moz-box-shadow:2px 3px 16px #252425; -webkit-box-shadow:2px 3px 16px #252425; -box-shadow:2px 3px 16px #252425;} +box-shadow:2px 3px 16px #252425; +position: relative;} #searchContent { diff --git a/itf/templates/mediagallery/view.html b/itf/templates/mediagallery/view.html index e6d0bb0..9acf235 100644 --- a/itf/templates/mediagallery/view.html +++ b/itf/templates/mediagallery/view.html @@ -19,7 +19,7 @@ -

{{ title }}

+

{{ title }}

{% if photos %}

Photos

@@ -59,6 +59,6 @@ {% endif %} -Close +Close {% endblock %} From 541abd9f9da1ad8d2b83c48a53cbe116df2f7086 Mon Sep 17 00:00:00 2001 From: karen menezes Date: Fri, 4 Jan 2013 06:18:41 -0800 Subject: [PATCH 2/3] changes to gallery --- itf/static/css/noel/inner-details.css | 8 +------- itf/static/css/noel/inner.css | 25 +++++++++++++++++++++++++ itf/static/css/noel/main.css | 4 ++++ itf/templates/mediagallery/upload.html | 23 +++++++++++++++-------- itf/templates/mediagallery/view.html | 4 ++-- 5 files changed, 47 insertions(+), 17 deletions(-) diff --git a/itf/static/css/noel/inner-details.css b/itf/static/css/noel/inner-details.css index 2c68b0c..d1c45cf 100755 --- a/itf/static/css/noel/inner-details.css +++ b/itf/static/css/noel/inner-details.css @@ -73,13 +73,7 @@ display:block;} .hideText {display:none;} -.lightboxHeading { - font-size: 130%; - padding: 10px; - text-align: center; -} - -#imagesContainer { +#imagesContainer, #videosContainer, #linksContainer { padding: 10px 14px; } diff --git a/itf/static/css/noel/inner.css b/itf/static/css/noel/inner.css index 68f363d..50ca110 100755 --- a/itf/static/css/noel/inner.css +++ b/itf/static/css/noel/inner.css @@ -590,6 +590,25 @@ height:100%;} margin: 0 auto; } +.photoContainer { + margin: 8px 0; +} +.photoContainer input, .galleryTitle, #youtubeURL, #linkURL { + padding: 4px 0; +} + +#addVideos button, #addLinks button { + padding: 4px 6px; +} + +.photoContainer input { + vertical-align: top; +} + +#addVideos, #addLinks { + padding: 10px; +} + .closinglightbox, .lightboxNext, .lightboxPrev { font-size:14px; color:#F7BD00; @@ -606,6 +625,12 @@ left:10px;} {position:absolute; right:10px;} +.lightboxHeading { + font-size: 130%; + padding: 10px; + text-align: center; +} + #addForm input, #addForm textarea { border:1px solid #e3e3e3; diff --git a/itf/static/css/noel/main.css b/itf/static/css/noel/main.css index a0fbc5b..2871728 100755 --- a/itf/static/css/noel/main.css +++ b/itf/static/css/noel/main.css @@ -14,6 +14,10 @@ strong display: block; } +.inlineBlock { + display: inline-block; +} + #header {width:960px; height:140px; diff --git a/itf/templates/mediagallery/upload.html b/itf/templates/mediagallery/upload.html index 4c030e7..daa8a9e 100644 --- a/itf/templates/mediagallery/upload.html +++ b/itf/templates/mediagallery/upload.html @@ -139,6 +139,7 @@ $(function() { min-width: 400px; min-height: 300px; max-width: 50%; + padding: 10px; } .progressBar { @@ -149,6 +150,12 @@ $(function() { .deleteItem { font-weight: bold; cursor: pointer; + vertical-align: top; + +} + +.closinglightbox { + padding: 10px; } .section { @@ -164,10 +171,10 @@ $(function() { {% endblock %} {% block main_content %} - Gallery Title: +

Gallery Title:

-

Upload Images

+

Upload Images

    @@ -187,7 +194,7 @@ $(function() {
-

Add Youtube Videos

+

Add Youtube Videos

Youtube Share Link: @@ -206,9 +213,9 @@ $(function() {
- - Done +
+ Done {% endblock %} diff --git a/itf/templates/mediagallery/view.html b/itf/templates/mediagallery/view.html index 9acf235..a779fda 100644 --- a/itf/templates/mediagallery/view.html +++ b/itf/templates/mediagallery/view.html @@ -38,7 +38,7 @@ {% if videos %}
-

Videos

+

Videos

{% for v in videos %} {% endfor %} @@ -47,7 +47,7 @@ {% if links %}