diff --git a/trunk/README b/trunk/README index bce3692..4209a8c 100755 --- a/trunk/README +++ b/trunk/README @@ -40,4 +40,5 @@ Help If you have any questions/bug reports/ideas, you can find help in the following locations: -http://mister-muffin.de/proj - Main project page and wiki +http://yolanda.mister-muffin.de/proj - Main project page and wiki +yolanda@conference.mister-muffin.de - jabber multi user chat diff --git a/trunk/daemon.pl b/trunk/daemon.pl index 6dfba9c..d4a455e 100755 --- a/trunk/daemon.pl +++ b/trunk/daemon.pl @@ -172,7 +172,7 @@ while(1) unlink "$root/tmp/$id"; } - #write status 1 to uploaded table + #delete from uploaded table $dbh->do(qq{delete from uploaded where id = ?}, undef, $id) or interrupt $dbh->errstr; } } diff --git a/trunk/functions.pl b/trunk/functions.pl index d805926..12337ff 100644 --- a/trunk/functions.pl +++ b/trunk/functions.pl @@ -76,6 +76,9 @@ sub get_page_array $page->{'xmlns:rdf'} = $xmlns_rdf; } +# called by video.pl (display ambiguous videos), +# search.pl (display search results) +# and account.pl (display own videos) sub fill_results { #connect to db @@ -132,7 +135,7 @@ sub fill_results 'dc:publisher' => [$publisher], 'dc:contributor' => [$contributor], 'dc:date' => [$timestamp], - 'dc:identifier' => ["$domain/video/$title/$id" . ($duration == 0 ? "/edit=true" : "")], + 'dc:identifier' => ["$domain/video/$title/$id" . ($duration == 0 ? "/action=edit" : "")], 'dc:source' => [$source], 'dc:language' => [$language], 'dc:coverage' => [$coverage], diff --git a/trunk/images/tango/accessories-text-editor.png b/trunk/images/tango/accessories-text-editor.png new file mode 100644 index 0000000..f84c37c Binary files /dev/null and b/trunk/images/tango/accessories-text-editor.png differ diff --git a/trunk/images/tango/bookmark-delete.png b/trunk/images/tango/bookmark-delete.png new file mode 100644 index 0000000..6c783f2 Binary files /dev/null and b/trunk/images/tango/bookmark-delete.png differ diff --git a/trunk/images/tango/bookmark-delete.svg b/trunk/images/tango/bookmark-delete.svg new file mode 100644 index 0000000..b48145a --- /dev/null +++ b/trunk/images/tango/bookmark-delete.svg @@ -0,0 +1,1257 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + New Bookmark + + + text + plaintext + regular + document + + + + + + Andreas Nilsson + + + http://www.gnome.org + + + Luca Ferretti +Jakub Steiner +Lapo Calamandrei + + + December 2006 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trunk/images/tango/bookmark-new.png b/trunk/images/tango/bookmark-new.png new file mode 100644 index 0000000..c67fbb8 Binary files /dev/null and b/trunk/images/tango/bookmark-new.png differ diff --git a/trunk/images/tango/bookmark.png b/trunk/images/tango/bookmark.png new file mode 100644 index 0000000..5108442 Binary files /dev/null and b/trunk/images/tango/bookmark.png differ diff --git a/trunk/images/tango/bookmark.svg b/trunk/images/tango/bookmark.svg new file mode 100644 index 0000000..efc5e18 --- /dev/null +++ b/trunk/images/tango/bookmark.svg @@ -0,0 +1,470 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + New Bookmark + + + text + plaintext + regular + document + + + + + + Andreas Nilsson + + + http://www.gnome.org + + + Luca Ferretti +Jakub Steiner +Lapo Calamandrei + + + December 2006 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trunk/video.pl b/trunk/video.pl index afd85a3..148f21f 100644 --- a/trunk/video.pl +++ b/trunk/video.pl @@ -10,7 +10,11 @@ $session = new CGI::Session; @page = get_page_array(@userinfo); -if($query->url_param('edit') eq 'true' and $query->url_param('id')) +if($query->url_param('action') eq 'edit' and $query->url_param('id')) +{ + $page->{'message'}->{'type'} = "information"; +} +if($query->url_param('action') eq 'bookmark' and $query->url_param('id')) { $page->{'message'}->{'type'} = "information"; } @@ -131,6 +135,7 @@ elsif($query->url_param('title') or $query->url_param('id')) 'fps' => $fps, 'viewcount' => $viewcount, 'downloadcount' => $downloadcount, + 'edit' => $userinfo->{'username'} eq $publisher ? "true" : "false", 'rdf:RDF' => { 'cc:Work' => @@ -187,7 +192,6 @@ elsif($query->url_param('title') or $query->url_param('id')) { #when an ambigous title was passed there may me many results - display them like search.pl does - $page->{'search'} = ['']; $page->{'results'}->{'scriptname'} = 'video.pl'; $page->{'results'}->{'argument'} = 'title'; $page->{'results'}->{'value'} = $query->param('title'); diff --git a/trunk/xsl/xhtml.xsl b/trunk/xsl/xhtml.xsl index 875768e..0515adb 100755 --- a/trunk/xsl/xhtml.xsl +++ b/trunk/xsl/xhtml.xsl @@ -22,6 +22,8 @@ + + @@ -221,6 +223,10 @@ + + wiki + + report bug @@ -254,7 +260,9 @@ : - + + + @@ -318,73 +326,5 @@ - -
- -
- - - -
- : -
- -
- : -
- -
- : -
- -
- - - - - -
-
- -
- - - - - - - - - - - - settings - - - bookmarks - - - diff --git a/trunk/xsl/xhtml/account.xsl b/trunk/xsl/xhtml/account.xsl new file mode 100644 index 0000000..d40d638 --- /dev/null +++ b/trunk/xsl/xhtml/account.xsl @@ -0,0 +1,99 @@ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +

results

+ + + +

settings

+
+
+ locale +
+ +
+
+ pagesize +
+ +
+
+ cortado + video plugin +
+
+ +
+
+ + +

bookmarks

+ + + + + diff --git a/trunk/xsl/xhtml/register.xsl b/trunk/xsl/xhtml/register.xsl new file mode 100644 index 0000000..5e1611a --- /dev/null +++ b/trunk/xsl/xhtml/register.xsl @@ -0,0 +1,41 @@ + + + + +
+ +
+ + + +
+ : +
+ +
+ : +
+ +
+ : +
+ +
+ + + + + +
+
+ +
+ + + diff --git a/trunk/xsl/xhtml/results.xsl b/trunk/xsl/xhtml/results.xsl index 883d8cf..f37e7c9 100644 --- a/trunk/xsl/xhtml/results.xsl +++ b/trunk/xsl/xhtml/results.xsl @@ -59,7 +59,7 @@ - + @@ -76,8 +76,10 @@
- -
+ + +
+ diff --git a/trunk/xsl/xhtml/video.xsl b/trunk/xsl/xhtml/video.xsl index 637308d..8d9980c 100644 --- a/trunk/xsl/xhtml/video.xsl +++ b/trunk/xsl/xhtml/video.xsl @@ -8,6 +8,7 @@ > +

@@ -88,22 +89,97 @@
-
+ - + + + + + + + + + + + + + + + + + + + + +
+ Filesize + + MB +
+ Duration + + + + + +
+ Viewcount + + +
+ Downloadcount + + +
+ + Permalink: +
+