From 22417a93426a3b0137ddcf1b6f6551642cf3b400 Mon Sep 17 00:00:00 2001 From: erlehmann Date: Fri, 7 Dec 2007 20:54:21 +0000 Subject: [PATCH] upload dialog complete: i expect crack and whores to be delivered to my space station git-svn-id: http://yolanda.mister-muffin.de/svn@196 7eef14d0-6ed0-489d-bf55-20463b2d70db --- trunk/locale/en-us.xml | 50 +++++--- trunk/site/main.xml | 5 +- trunk/style/default.css | 20 +++ trunk/xsl/xhtml/upload.xsl | 255 ++++++++++++++++++++++++------------- trunk/xsl/xhtml/video.xsl | 125 +++++++++--------- 5 files changed, 287 insertions(+), 168 deletions(-) diff --git a/trunk/locale/en-us.xml b/trunk/locale/en-us.xml index e6863db..772c6a5 100755 --- a/trunk/locale/en-us.xml +++ b/trunk/locale/en-us.xml @@ -92,9 +92,18 @@ file - next page - previous page + continue upload + Basic Information + Similar Videos + Additional Metainformation + Licensing + Summary / Upload + Describe the video you want to upload. + Similar videos have already been uploaded. If none of these videos matches yours, continue. + Providing these infos helps us to put the video into context. + Describe the video's license. + Double-check the data and correct mistakes, if necessary. Specify the file you want to upload. State the title of the video. Specify the creator of the video. @@ -103,27 +112,36 @@ Specify the source, preferably by URL. State the language of the video. Specify the time and location covered. - This is page 1 of 6. - This is page 2 of 6. - This is page 3 of 6. - This is page 4 of 6. - This is page 5 of 6. - This is page 6 of 6. - Page 1 - Page 3 - Page 4 + Specify the license, preferably by URL. + Optionally, choose Creative Commons licensing. + Permit modification. + Permit modification, derivatives must use the same license. + Prohibit modification. + Prohibit commercial use. + This is page 1 of 5. + This is page 2 of 5. + This is page 3 of 5. + This is page 4 of 5. + This is page 5 of 5. + go to page 1 + go to page 3 + go to page 4 + + + English + German - Download + download MB use browser plugin use java applet - Edit - Bookmark - License Conditions + edit + bookmark + license conditions To embed the video on another web page, use the following HTML code: Flamewar area below. Proceed with caution. - Post + post backlink diff --git a/trunk/site/main.xml b/trunk/site/main.xml index 98d7a55..10eeffe 100755 --- a/trunk/site/main.xml +++ b/trunk/site/main.xml @@ -8,9 +8,6 @@ WebTV free as in Speech - /account.pl /account.pl?show=settings /account.pl?show=uploads @@ -23,7 +20,7 @@ http://www.fsf.org/licensing/licenses/agpl-3.0.html http://yolanda.mister-muffin.de/trac/browser/trunk /register.pl - http://yolanda.mister-muffin.de/trac/ WHERE IS THE BUGTRACKER ? + http://yolanda.mister-muffin.de/trac/newticket search.pl?query= /upload.pl uploader.pl diff --git a/trunk/style/default.css b/trunk/style/default.css index 462e473..5835a23 100755 --- a/trunk/style/default.css +++ b/trunk/style/default.css @@ -48,6 +48,16 @@ div margin: 0.5em; } + div.cc-license-chooser + { + } + + div.cc-license-chooser img + { + margin: 0.25em; + vertical-align: middle; + } + div.comments { display: none; @@ -199,6 +209,16 @@ span.code font-family: monospace; } +span.heading +{ + font-size: 1.5em; +} + +span.instruction +{ + color: #606060; +} + span.protip { color: #606060; diff --git a/trunk/xsl/xhtml/upload.xsl b/trunk/xsl/xhtml/upload.xsl index 5d44b3f..d1214cf 100644 --- a/trunk/xsl/xhtml/upload.xsl +++ b/trunk/xsl/xhtml/upload.xsl @@ -11,8 +11,13 @@ -

Basic Description

-

These entries describe the very nature of your upload. All fields are required to be filled appropriately.

+ + + +
+ + +
@@ -78,9 +83,13 @@ -

Uploads that match your description

-

If the attributes you just entered is imilar to those of already uploaded videos you will see the results below.

-

Please check if your video is not among them and then click next to proceed.

+ + + +
+ + + @@ -121,11 +130,6 @@
- - - - - @@ -141,8 +145,13 @@ -

Additional information

-

The following fields are optional but recommended.

+ + + +
+ + + @@ -163,38 +172,33 @@
-
+

- myself -
- other: -
-
+

-
+

-
+

- - - - - @@ -209,8 +213,13 @@ -

Licensing

-

If you are the copyright holder feel free to use creative commons to license your work. If not, select the original license of your video.

+ + + +
+ + + @@ -251,29 +260,48 @@
-
- none + +
+ +
+ +
+ +
+ + +
- proprietary + + +
- public domain + + +
- creative commons + + +
- + + + +
+ + + +
+ + + +
+ + + +
- - - - - + @@ -288,8 +316,13 @@ -

Summary

-

Please check everything for correctness and edit if neccessary.

+ + + +
+ + + @@ -345,46 +378,91 @@ -
- title: -
- subject: -
- description: -
- - - - - -
-
- creator: -
- source: -
- language: -
- coverage: -
- - - - - -
-
- license: -
- - - - - -
+ + + + + + + + + + + + + + +
+ : + + +
+ : + + +
+ : + + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ : + + +
+ : + + +
+ : + + +
+ : + + +
+ + + + + + + + + + + + + + +
-

If Everything is okay proceed below by uploading your video.

@@ -425,11 +503,10 @@
-

-
+
diff --git a/trunk/xsl/xhtml/video.xsl b/trunk/xsl/xhtml/video.xsl index e61562e..9a97252 100644 --- a/trunk/xsl/xhtml/video.xsl +++ b/trunk/xsl/xhtml/video.xsl @@ -165,65 +165,8 @@
-
- - - - - : - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + @@ -329,4 +272,68 @@ + + +
+ + + + + : + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +