From ee111baa67c66e2ccf5f8418536fefee5fb5a6d5 Mon Sep 17 00:00:00 2001 From: erlehmann Date: Sat, 15 Dec 2007 22:00:14 +0000 Subject: [PATCH] conflict solved (i hope so) git-svn-id: http://yolanda.mister-muffin.de/svn@199 7eef14d0-6ed0-489d-bf55-20463b2d70db --- trunk/NEWS | 0 trunk/locale/en-us.xml | 20 +++-- trunk/xsl/xhtml/results.xsl | 171 +++++++++++++++++------------------- 3 files changed, 98 insertions(+), 93 deletions(-) delete mode 100644 trunk/NEWS diff --git a/trunk/NEWS b/trunk/NEWS deleted file mode 100644 index e69de29..0000000 diff --git a/trunk/locale/en-us.xml b/trunk/locale/en-us.xml index bd7d508..f3bf7c0 100755 --- a/trunk/locale/en-us.xml +++ b/trunk/locale/en-us.xml @@ -68,16 +68,26 @@ results for query - ordered by - ascending - descending + ordered by + ascending + descending + oldest first + most recent first + least downloaded first + most downloaded first + least viewed first + most viewed first + shortest first + lenghtest first + smallest first + biggest first results on pages relevance duration filesize - viewcount - downloadcount + views + downloads timestamp diff --git a/trunk/xsl/xhtml/results.xsl b/trunk/xsl/xhtml/results.xsl index b6ca16a..0404c4f 100644 --- a/trunk/xsl/xhtml/results.xsl +++ b/trunk/xsl/xhtml/results.xsl @@ -9,84 +9,77 @@ - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - + +
+ + + + + + + + + + + + + +
+ + + + + + + + + + + () + + + () + + + +
+ + + processing, please wait.... + + + invalid audio and/or video stream + + + file not found - contact the admin + + + file is not a video + + + same video was already uploaded + + +
+ + + + + - - processing, please wait.... - - - invalid audio and/or video stream - - - file not found - contact the admin - - - file is not a video - - - same video was already uploaded + + + + + - - - - - - - - - - - - - edit - - -
+ + edit + + + +
@@ -134,50 +127,50 @@ - the oldest videos + - the newest videos + - the least downloaded videos + - the most downloaded videos + - the least viewed videos + - the most viewed videos + - the shortest videos + - the lengthest videos + - the smallest videos + - the biggest videos + @@ -186,10 +179,12 @@
- results on pages +   +   +   +
- - +