projects / Portfolio.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 17b463f)
Cosmétique : une image de fond qui suggère l'espace de dépôt.
authorBenoît Pin <pin@cri.ensmp.fr>
Wed, 12 Jun 2013 13:33:54 +0000 (15:33 +0200)
committerBenoît Pin <pin@cri.ensmp.fr>
Wed, 12 Jun 2013 13:33:54 +0000 (15:33 +0200)
skins/image-upload-dd-target.png [new file with mode: 0644] patch | blob
skins/photo_layout_macros.pt patch | blob | history
skins/portfolio_style.css.dtml patch | blob | history
skins/portfolio_view.pt patch | blob | history

diff --git a/skins/image-upload-dd-target.png b/skins/image-upload-dd-target.png
new file mode 100644 (file)
index 0000000..65555b1
Binary files /dev/null and b/skins/image-upload-dd-target.png differ
diff --git a/skins/photo_layout_macros.pt b/skins/photo_layout_macros.pt
index daf722b..88356b6 100644 (file)
--- a/skins/photo_layout_macros.pt
+++ b/skins/photo_layout_macros.pt
@@ -8,7 +8,7 @@
          tal:define="slide_size portal_object/slide_size;"
          i18n:domain="portfolio">
       <div metal:use-macro="here/batch_macros/macros/navigation">batch navigation</div>
          tal:define="slide_size portal_object/slide_size;"
          i18n:domain="portfolio">
       <div metal:use-macro="here/batch_macros/macros/navigation">batch navigation</div>
-      <div id="lightbox" class="lightbox">
+      <div id="lightbox" class="lightbox photo-drop-target">
         <span tal:repeat="info infos" tal:omit-tag="">
           <span tal:define="size info/thumbSize;
                             margin_top python:(slide_size - size['height']) / 2;
         <span tal:repeat="info infos" tal:omit-tag="">
           <span tal:define="size info/thumbSize;
                             margin_top python:(slide_size - size['height']) / 2;
diff --git a/skins/portfolio_style.css.dtml b/skins/portfolio_style.css.dtml
index 63c996d..e4be18a 100755 (executable)
--- a/skins/portfolio_style.css.dtml
+++ b/skins/portfolio_style.css.dtml
@@ -160,6 +160,13 @@ table.metadata_category select:focus {
   font-size: &dtml-fontSmallSize;;
 }
 
   font-size: &dtml-fontSmallSize;;
 }
 
+div.lightbox { /*the lightbox itself*/
+  min-height:300px;
+}
+
+.photo-drop-target {
+  background: url('&dtml-portal_url;/image-upload-dd-target.png') no-repeat center center;
+}
 
 .lightbox span {
     width: &dtml-slide_size;px;
 
 .lightbox span {
     width: &dtml-slide_size;px;
diff --git a/skins/portfolio_view.pt b/skins/portfolio_view.pt
index e0768d0..3aab906 100644 (file)
--- a/skins/portfolio_view.pt
+++ b/skins/portfolio_view.pt
@@ -4,8 +4,9 @@
   <head>
     <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
     <metal:block metal:fill-slot="javascript_head_slot">
   <head>
     <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
     <metal:block metal:fill-slot="javascript_head_slot">
-      <script type="text/javascript" tal:attributes="src string:${portal_url}/cart_widgets.js"></script>
-      <script type="text/javascript" tal:attributes="src string:${portal_url}/photo_lightbox_viewer.js"></script>
+      <script type="text/javascript" tal:attributes="src string:$portal_url/cart_widgets.js"></script>
+      <script type="text/javascript" tal:attributes="src string:$portal_url/photo_lightbox_viewer.js"></script>
+      <script type="text/javascript" tal:attributes="src string:$portal_url/fileupload.js"charset="utf-8"></script>
     </metal:block>
     <title>portfolio_view</title>
   </head>
     </metal:block>
     <title>portfolio_view</title>
   </head>
Photo / portfolio product for Plinn