dummy license output, price for pr0n is now > 9000, css is shinier than

ever


git-svn-id: http://yolanda.mister-muffin.de/svn@257 7eef14d0-6ed0-489d-bf55-20463b2d70db

trunk/functions.pl

@@ -214,7 +214,7 @@ sub output_page
         {
             return $session->header(
                 -status=>'402 Payment required',
-                -cost=>'$9000.00',
+                -cost=>'$9001.00',  # OVER NEIN THOUSAND
             )
         }
         else

trunk/locale/en-us.xml

@@ -155,16 +155,16 @@
     <string id="language_de-de">German</string>
 
     <!-- video page -->
-    <string id="video_download">download</string>
+    <string id="video_download">Download</string>
-    <string id="video_playback">plackback</string>
+    <string id="video_playback">Plackback</string>
     <string id="junk_video">mark as junk</string>
     <string id="edit_video">edit</string>
     <string id="watch_browserplugin">use browser plugin</string>
     <string id="watch_cortadoapplet">use java applet</string>
     <string id="license_conditions">license conditions</string>
     <string id="protip_embed">To embed the video on another web page, use the following HTML code:</string>
-    <string id="login_to_comment">login to comment</string>
+    <string id="login_to_comment">Login to comment</string>
-    <string id="comment_post">post</string>
+    <string id="comment_post">Post</string>
 
     <!-- embedded video page-->
     <string id="backlink">backlink</string>

trunk/style/colors/tango.css

@@ -53,11 +53,11 @@ div
     border-color:   #555753;
 }
 
-    div.button-download
+    div.cc-license
     {
     }
 
-        div.button-download img
+        div.cc-license img
         {
         }
 
@@ -92,6 +92,7 @@ div.loginbox
         {
         /* TODO: find out how to set vertical-align:middle for this image */
         content:        url(../../images/tango/32x32/dialog-error.png);
+        height:         200px;
         }
 
         div.messagebox#information
@@ -124,6 +125,10 @@ div.loginbox
         border-color:   #555753;
     }
 
+    div.protip-embed
+    {
+    }
+
 div#preview
 {
 }
@@ -167,6 +172,39 @@ form
         {
         }
 
+li
+{
+}
+
+    li#latestadditions
+    {
+        list-style-image:       url(../../images/tango/16x16/actions/document-new.png)
+    }
+
+    li#logout
+    {
+        list-style-image:       url(../../images/tango/16x16/actions/system-log-out.png)
+    }
+
+    li#mostviews
+    {
+        list-style-image:       url(../../images/tango/16x16/emblems/emblem-favorite.png)
+    }
+
+    li#mostdownloads
+    {
+        list-style-image:       url(../../images/tango/16x16/actions/document-save.png)
+    }
+
+    li#upload
+    {
+        list-style-image:       url(../../images/tango/16x16/actions/go-up.png)
+    }
+
+p
+{
+}
+
 span
 {
 }
@@ -195,6 +233,10 @@ ul
 {
 }
 
+    ul#account-actions
+    {
+    }
+
     ul#footer,
     ul#header
     {
@@ -217,18 +259,3 @@ ul
     ul#queries
     {
     }
-
-        ul#queries li#latestadditions
-        {
-            list-style-image:       url(../../images/tango/16x16/actions/document-new.png)
-        }
-
-        ul#queries li#mostviews
-        {
-            list-style-image:       url(../../images/tango/16x16/emblems/emblem-favorite.png)
-        }
-
-        ul#queries li#mostdownloads
-        {
-            list-style-image:       url(../../images/tango/16x16/actions/document-save.png)
-        }

trunk/style/decoration/bridget.css

@@ -67,16 +67,17 @@ div
     {
     }
 
-    div.button-download
+    div.cc-license
     {
         /* TODO: find out /why we do this/ (see div.searchbar) ! */
         margin-top:         0em;
         vertical-align:     top;
     }
 
-        div.button-download img
+        div.cc-license img
         {
-            margin:     0.5em;
+            border-width:   0px;
+            margin:         0.5em;
         }
 
     div.cc-license-chooser
@@ -107,6 +108,7 @@ div
 
     div.messagebox
     {
+        font-weight:        bold;
         /* correct spacing to avoid overlapping with float:right elements */
         margin-right:       22em;
     }
@@ -137,6 +139,12 @@ div
         overflow:       visible;
     }
 
+    div.protip-embed
+    {
+        /* correct spacing to avoid overlapping with float:right elements */
+        margin-right:       22em;
+    }
+
 div#preview
 {
         /* correct spacing to avoid overlapping with float:right elements */
@@ -167,11 +175,10 @@ div#preview
 
     div.results
     {
-/*        border-width:       0px;*/
+        border-width:       0px;
         /* correct spacing to avoid overlapping with float:right elements */
-        margin:             0em;
         margin-right:       22em !important;
-        padding:            0em;
+        padding:            0px;
     }
 
         div.results div.result
@@ -208,6 +215,10 @@ div#preview
         text-align:         justify;
     }
 
+    div.video
+    {
+    }
+
 form
 {
 }
@@ -221,11 +232,27 @@ form
         {
         }
 
-    h1
+h1
+{
+    font-weight:        normal;
+    font-size:          2em;
+    text-align:         center;
+}
+
+li
+{
+}
+
+    li#latestadditions
+    {
+    }
+
+    li#mostviews
+    {
+    }
+
+    li#mostdownloads
     {
-        font-weight:        normal;
-        font-size:          2em;
-        text-align:         center;
     }
 
 input
@@ -238,18 +265,24 @@ img
     border-width:       0;
 }
 
+p
+{
+    margin:         0.5em;
+    padding:        0.5em;
+}
+
 span
 {
 }
 
     span.duration:after
     {
-        content:            ") ";
+        content:            ")";
     }
 
     span.duration:before
     {
-        content:            " (";
+        content:            "(";
     }
 
     span.instruction
@@ -275,6 +308,10 @@ ul
 {
 }
 
+    ul#account-actions
+    {
+    }
+
     ul#footer,
     ul#header
     {
@@ -297,20 +334,9 @@ ul
                 padding:            1em;
             }
 
+    ul#account-actions,
     ul#queries
     {
         font-size:          1.5em;
         font-weight:        bold;
     }
-
-        ul#queries li#latestadditions
-        {
-        }
-
-        ul#queries li#mostviews
-        {
-        }
-
-        ul#queries li#mostdownloads
-        {
-        }

trunk/style/structure/fake6.css

@@ -40,13 +40,17 @@ div
 {
 }
 
-    div.button-download
+    div.cc-license
     {
         clear:          right;
         float:          right;
         width:          20em;
     }
 
+        div.cc-license img
+        {
+        }
+
     div.comments
     {
     }
@@ -65,6 +69,22 @@ div
         width:          20em;
     }
 
+    div.messagebox
+    {
+    }
+
+        div.messagebox#error
+        {
+        }
+
+        div.messagebox#information
+        {
+        }
+
+        div.messagebox#warning
+        {
+        }
+
     div.metadata
     {
         clear:          right;
@@ -81,6 +101,10 @@ div
         overflow:       visible;
     }
 
+    div.protip-embed
+    {
+    }
+
     div#preview
     {
         position: relative;
@@ -113,8 +137,10 @@ div
 
         div.results div.result
         {
-            float:          left;
+/*
-            position:       relative;
+            at this point, browsers such as firefox 2.0 mess up
+*/
+            display:        inline-block;
         }
 
             div.results div.result img
@@ -123,9 +149,10 @@ div
 
             div.results div.result img.flag
             {
-                bottom:         3em;
+                position:       relative;
-                position:       absolute;
+                /* flag is 32px wide and has 1px borders */
-                right:          0.5em;
+                right:          34px;
+                margin-right:   -34px;
             }
 
     div.searchbar
@@ -148,20 +175,14 @@ div
     div.video
     {
         display:            inline-block;
-        margin-bottom:      0.5em;
     }
 
     div.videoccdata
     {
-        margin:             0.75em;
     }
 
         div.videoccdata img
         {
-            border-width:   0px;
-            margin-left:    0.5em;
-            margin-right:   0.5em;
-            margin-top:     0.5em;
         }
 
     div.videotitle
@@ -185,6 +206,26 @@ h1
 {
 }
 
+li
+{
+}
+
+    li#latestadditions
+    {
+    }
+
+    li#mostviews
+    {
+    }
+
+    li#mostdownloads
+    {
+    }
+
+p
+{
+}
+
 span
 {
 }
@@ -241,6 +282,10 @@ ul
 {
 }
 
+    ul#account-actions
+    {
+    }
+
     ul#footer,
     ul#header
     {
@@ -263,15 +308,3 @@ ul
     ul#queries
     {
     }
-
-        ul#queries li#latestadditions
-        {
-        }
-
-        ul#queries li#mostviews
-        {
-        }
-
-        ul#queries li#mostdownloads
-        {
-        }

trunk/video.pl

@@ -187,7 +187,38 @@ elsif($query->url_param('title') or $query->url_param('id'))
                 },
                 'cc:License'    =>
                 {
-                    'rdf:about' => $license
+                    'rdf:about'     => $license,
+# ↓↓ dummy code because josch is too lazy for DOIN IT RITE ↓↓
+                    'cc:permits'    =>
+                        {
+                            'rdf:resource'     => "http://web.resource.org/cc/Reproduction"
+                        },
+                    'cc:permits'    =>
+                        {
+                            'rdf:resource'     => "http://web.resource.org/cc/Distribution"
+                        },
+                    'cc:permits'    =>
+                        {
+                            'rdf:resource'     => "http://web.resource.org/cc/DerivativeWorks"
+                        },
+                    'cc:requires'    =>
+                        {
+                            'rdf:resource'     => "http://web.resource.org/cc/Notice"
+                        },
+                    'cc:requires'    =>
+                        {
+                            'rdf:resource'     => "http://web.resource.org/cc/ShareAlike"
+                        },
+                    'cc:prohibits'    =>
+                        {
+                            'rdf:resource'     => "http://web.resource.org/cc/CommercialUse"
+                        },
+                    'cc:prohibits'    =>
+                        {
+                            'rdf:resource'     => "http://web.resource.org/cc/DerivativeWorks"
+                        }
+# ↑↑ dummy code because josch is too lazy for DOIN IT RITE ↑↑
+# sadly, i dunno how to add multiple tags 
                 }
             }
         };

trunk/xsl/xhtml/loginbox.xsl

@@ -9,37 +9,92 @@
 
 <xsl:template name="loginbox">
     <div class="loginbox">
-        <form method="post">
+
-            <xsl:attribute name="action">
+        <xsl:choose>
-                <xsl:value-of select="$site_strings[@id='path_login']" />
+            <xsl:when test="string-length(//@username)=0">
-            </xsl:attribute>
+
-            <fieldset>
+                <form method="post">
+                    <xsl:attribute name="action">
+                        <xsl:value-of select="$site_strings[@id='path_login']" />
+                    </xsl:attribute>
+                    <fieldset>
+
+        <!--
+                        why do we need this hidden input ?
+        -->
+                        <input name="action" type="hidden" value="login" />
+
+                        <label for="user">
+                            <xsl:value-of select="$locale_strings[@id='username']" />:
+                        </label>
+                        <br />                
+                        <input name="user" type="text" />
+                        <br />
+
+                        <label for="pass">
+                            <xsl:value-of select="$locale_strings[@id='password']" />:
+                        </label>
+                        <br />
+                        <input name="pass" type="password" />
+
+                        <input type="submit" name="login" >
+                            <xsl:attribute name="value">
+                                <xsl:value-of select="$locale_strings[@id='button_login']" />
+                            </xsl:attribute>
+                        </input>
+
+                    </fieldset>
+                </form>
+
+            </xsl:when>
+            <xsl:otherwise>
 
 <!--
-                why do we need this hidden input ?
+                <xsl:value-of select="$locale_strings[@id='logged_in_as']" />
--->
+                <a>
-                <input name="action" type="hidden" value="login" />
+                    <xsl:attribute name="href">
-
+                        user/<xsl:value-of select="//@username" />
-                <label for="user">
-                    <xsl:value-of select="$locale_strings[@id='username']" />:
-                </label>
-                <br />                
-                <input name="user" type="text" />
-                <br />
-
-                <label for="pass">
-                    <xsl:value-of select="$locale_strings[@id='password']" />:
-                </label>
-                <br />
-                <input name="pass" type="password" />
-
-                <input type="submit" name="login" >
-                    <xsl:attribute name="value">
-                        <xsl:value-of select="$locale_strings[@id='button_login']" />
                     </xsl:attribute>
-                </input>
+                    <xsl:value-of select="//@username" />
-            </fieldset>
+                </a>
-        </form>
+-->
+
+                <ul id="account-actions" role="navigation">
+
+                    <li id="upload">
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$site_strings[@id='path_upload']" />
+                            </xsl:attribute>
+                            <xsl:value-of select="$locale_strings[@id='header_upload-video']" />
+                        </a>
+                    </li>
+
+<!--
+                    <li id="">
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$site_strings[@id='path_settings']" />
+                            </xsl:attribute>
+                            <xsl:value-of select="$locale_strings[@id='settings_details']" />
+                        </a>
+                    </li>
+-->
+
+                    <li id="logout">
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$site_strings[@id='path_logout']" />
+                            </xsl:attribute>
+                            <xsl:value-of select="$locale_strings[@id='logout']" />
+                        </a>
+                    </li>
+
+                </ul>
+
+            </xsl:otherwise>
+        </xsl:choose>
+
     </div>
 
 </xsl:template>

trunk/xsl/xhtml/messagebox.xsl

@@ -22,11 +22,11 @@
             </xsl:when>
         </xsl:choose>
         <xsl:variable name="messagetext" select="/page/message/@text" />
-        <strong>
+        <span class="message">
             <xsl:value-of select="$locale_strings[@id=$messagetext]" />
             <xsl:value-of select="/page/message/@value" />
             <!-- probably one can do this on one line, dunno how -->
-        </strong>
+        </span>
     </div>
 
 </xsl:template>

trunk/xsl/xhtml/results.xsl

@@ -51,7 +51,6 @@
                             <xsl:value-of select="rdf:RDF/cc:Work/dc:title" />
                         </xsl:attribute>
                     </img>
-
                     <img class="flag">
                         <xsl:attribute name="src">
                             <xsl:value-of select="concat('/images/flags/', rdf:RDF/cc:Work/dc:language, '.png')" />
@@ -60,7 +59,6 @@
                             <xsl:value-of select="rdf:RDF/cc:Work/dc:language" />
                         </xsl:attribute>
                     </img>
-
                 </a>
                 <br />
                 <a>

trunk/xsl/xhtml/searchbar.xsl

@@ -34,36 +34,36 @@
             </fieldset>
         </form>
 
-    <ul id="queries" role="navigation">
+        <ul id="queries" role="navigation">
 
-        <li id="latestadditions">
+            <li id="latestadditions">
-            <a>
+                <a>
-                <xsl:attribute name="href">
+                    <xsl:attribute name="href">
-                    <xsl:value-of select="$site_strings[@id='path_query_latestadditions']" />
+                        <xsl:value-of select="$site_strings[@id='path_query_latestadditions']" />
-                </xsl:attribute>
+                    </xsl:attribute>
-                <xsl:value-of select="$locale_strings[@id='query_latestadditions']" />
+                    <xsl:value-of select="$locale_strings[@id='query_latestadditions']" />
-            </a>
+                </a>
-        </li>
+            </li>
 
-        <li id="mostviews">
+            <li id="mostviews">
-            <a>
+                <a>
-                <xsl:attribute name="href">
+                    <xsl:attribute name="href">
-                    <xsl:value-of select="$site_strings[@id='path_query_mostviews']" />
+                        <xsl:value-of select="$site_strings[@id='path_query_mostviews']" />
-                </xsl:attribute>
+                    </xsl:attribute>
-                <xsl:value-of select="$locale_strings[@id='query_mostviews']" />
+                    <xsl:value-of select="$locale_strings[@id='query_mostviews']" />
-            </a>
+                </a>
-        </li>
+            </li>
 
-        <li id="mostdownloads">
+            <li id="mostdownloads">
-            <a>
+                <a>
-                <xsl:attribute name="href">
+                    <xsl:attribute name="href">
-                    <xsl:value-of select="$site_strings[@id='path_query_mostdownloads']" />
+                        <xsl:value-of select="$site_strings[@id='path_query_mostdownloads']" />
-                </xsl:attribute>
+                    </xsl:attribute>
-                <xsl:value-of select="$locale_strings[@id='query_mostdownloads']" />
+                    <xsl:value-of select="$locale_strings[@id='query_mostdownloads']" />
-            </a>
+                </a>
-        </li>
+            </li>
 
-    </ul>
+        </ul>
 
     </div>
 

trunk/xsl/xhtml/video.xsl

@@ -65,26 +65,26 @@
 
     <xsl:call-template name="video-description" />
 
+    <xsl:call-template name="video-cclicense"/>
+
     <xsl:call-template name="video-metadata" />
 
+<!--
     <xsl:call-template name="video-actions" />
+-->
 
     <xsl:call-template name="video-object" />
 
-    <xsl:call-template name="cclicense"/>
+    <div class="protip-embed">
-
+        <xsl:value-of select="$locale_strings[@id='protip_embed']" />
-    <div class="videostuff">
+        <br />
-        <span class="protip-embed">
+        <code>
-            <xsl:value-of select="$locale_strings[@id='protip_embed']" />
+            &lt;object data="<xsl:value-of select="concat(//rdf:RDF/cc:Work/dc:identifier, 'embed=true')" />"
-            <br />
+                type="application/xml"
-            <code>
+                width=<xsl:value-of select="//video/@width + 24" />
-                &lt;object data="<xsl:value-of select="concat(//rdf:RDF/cc:Work/dc:identifier, 'embed=true')" />"
+                height=<xsl:value-of select="//video/@height + 48" />
-                    type="application/xml"
+            /&gt;
-                    width=<xsl:value-of select="//video/@width + 24" />
+        </code>
-                    height=<xsl:value-of select="//video/@height + 48" />
-                /&gt;
-            </code>
-        </span>
     </div>
 
 <!--
@@ -149,9 +149,13 @@
 
 </xsl:template>
 
-<xsl:template name="cclicense">
+<xsl:template name="video-cclicense">
+
+    <div class="cc-license">
+<!--
+    TODO: make image paths relative
+    TODO: internationalized alt attributes
 
-    <div class="videoccdata">
         <a>
             <xsl:attribute name="href">
                 <xsl:value-of select="//video/rdf:RDF/cc:License/@rdf:about" />
@@ -159,6 +163,7 @@
             <xsl:value-of select="$locale_strings[@id='license_conditions']" />:
         </a>
         <br />
+-->
         <a>
             <xsl:attribute name="href">
                 <xsl:value-of select="//video/rdf:RDF/cc:License/@rdf:about" />
@@ -167,45 +172,46 @@
             unfinished bizness
             <xsl:value-of select="@rdf:about" />
             <xsl:if test="true()">
-                <img src="./images/cc/somerights.png" />
+                <img src="/images/cc/somerights.png" />
             </xsl:if>
 -->
             <xsl:for-each select="//video/rdf:RDF/cc:License/cc:permits">
 <!--
-                since we are talking about digital media here, distribution actually /is/ reproduction
+                since we are talking about digital media here, distribution actually /is/ reproduction.
-                (also, i was too stupid to figure out how to test for both conditions).
                 <xsl:if test="@rdf:resource = 'http://web.resource.org/cc/Reproduction'">
-                    <img src="./images/cc/cc-share.png" />
+                    <img src="./images/cc/32x32/cc-share.png" />
                 </xsl:if>
 -->
                 <xsl:if test="@rdf:resource = 'http://web.resource.org/cc/Distribution'">
-                    <img src="./images/cc/cc-share.png" />
+                    <img alt="share" src="/images/cc/32x32/cc-share.png" />
                 </xsl:if>
                 <xsl:if test="@rdf:resource = 'http://web.resource.org/cc/DerivativeWorks'">
-                    <img src="./images/cc/cc-remix.png" />
+                    <img alt="remix" src="/images/cc/32x32/cc-remix.png" />
                 </xsl:if>
             </xsl:for-each>
-            <xsl:for-each select="rdf:RDF/cc:License/cc:requires">
+
+            <xsl:for-each select="//video/rdf:RDF/cc:License/cc:requires">
                 <xsl:if test="@rdf:resource = 'http://web.resource.org/cc/Notice'">
-                    <img src="./images/cc/cc-by.png" />
+                    <img alt="by" src="/images/cc/32x32/cc-by.png" />
                 </xsl:if>
                 <xsl:if test="@rdf:resource = 'http://web.resource.org/cc/ShareAlike'">
-                    <img src="./images/cc/cc-sharealike.png" />
+                    <img alt="sharealike" src="/images/cc/32x32/cc-sharealike.png" />
                 </xsl:if>
 <!--
-                source code doesn't make much sense in video context.
+                source code doesn't make much sense in video context
+                (the blender people probably would like it)
                 still, this is preserved for potential future use.
                 <xsl:if test="@rdf:resource = 'http://web.resource.org/cc/SourceCode'">
-                SOURCE
+                    <img src="/images/cc/32x32/cc-source-code.png" />
                 </xsl:if>
--->
+-->            </xsl:for-each>
-            </xsl:for-each>
+
-            <xsl:for-each select="rdf:RDF/cc:License/cc:prohibits">        
+            <xsl:for-each select="//video/rdf:RDF/cc:License/cc:prohibits">        
                 <xsl:if test="@rdf:resource = 'http://web.resource.org/cc/CommercialUse'">
-                    <img src="./images/cc/cc-noncommercial.png" />
+                    <img alt="noncommercial" src="/images/cc/32x32/cc-noncommercial.png" />
                 </xsl:if>
                 <xsl:if test="@rdf:resource = 'http://web.resource.org/cc/DerivativeWorks'">
-                    <img src="./images/cc/cc-noderivatives.png" />
+                    <img alt="noderivatives" src="/images/cc/32x32/cc-noderivatives.png" />
                 </xsl:if>
             </xsl:for-each>
         </a>
@@ -213,6 +219,7 @@
 
 </xsl:template>
 
+<!--
 <xsl:template name="video-actions">
     <div class="button-download">
         <a>
@@ -232,12 +239,13 @@
         (<xsl:value-of select="format-number(number(round(//video/@filesize) div 1048576), '0.0#')" />&#160;<xsl:value-of select="$locale_strings[@id='unit_megabytes']" />)
     </div>
 </xsl:template>
+-->
 
 <xsl:template name="video-description">
 
     <div class="description">
         <h1>
-            <xsl:value-of select="//video/rdf:RDF/cc:Work/dc:title" />
+            <xsl:value-of select="//video/rdf:RDF/cc:Work/dc:title" />&#160;
             <span class="duration">
                 <xsl:variable name="hours" select="floor(//video/@duration div 3600)" />
                 <xsl:variable name="minutes" select="floor((//video/@duration - $hours*3600) div 60)" />
@@ -303,12 +311,7 @@
                 </td>
             </tr>
 
-        </table>
+<!--
-
-        <hr />
-
-        <table class="metadata">
-
             <tr>
                 <td class="metadata-title">
                     <xsl:value-of select="$locale_strings[@id='DC.Publisher']" />:
@@ -326,6 +329,7 @@
                     <xsl:value-of select="//video/rdf:RDF/cc:Work/dc:date" />
                 </td>
             </tr>
+-->
 
             <tr>
                 <td class="metadata-title">