diff --git a/trunk/config/backend.xml b/trunk/config/backend.xml
new file mode 100644
index 0000000..21848b8
--- /dev/null
+++ b/trunk/config/backend.xml
@@ -0,0 +1,30 @@
+
+
+
+
+ mysql
+ yolanda
+
+ en-us
+ xhtml.xsl
+ http://localhost/
+
+
+
+ 10
+ 3
+ 20
+ 720
+ 240
+ 1080
+ 320
+ 204800
+ 512
+
+
+
+ true
+ true
+
+
+
diff --git a/trunk/functions.pl b/trunk/functions.pl
index eaaae72..5c29dc9 100644
--- a/trunk/functions.pl
+++ b/trunk/functions.pl
@@ -138,14 +138,15 @@ sub output_page
{
use XML::LibXSLT;
use XML::LibXML;
-
+
my $parser = XML::LibXML->new();
my $xslt = XML::LibXSLT->new();
-
- #let the XSLT param choose other stylesheets or default to xhtml.xsl
+
+ # let the XSLT param choose other stylesheets or default to xhtml.xsl
my $param_xslt = $query->param('xslt');
$param_xslt =~ s/[^\w]//gi;
-
+
+ # "null" is a debuggin option, make it so that this doesn't show up in the final product
if($param_xslt eq "null")
{
return $session->header(
diff --git a/trunk/include.pl b/trunk/include.pl
index 81a770e..963e9ec 100644
--- a/trunk/include.pl
+++ b/trunk/include.pl
@@ -25,7 +25,9 @@ $dbpass = '';
$domain = 'http://localhost';
$session_name = 'sid';
$locale = "en-US";
+# remove stylesheet attribute, this is an XSLT job
$stylesheet = "/style/default.css";
+# WHAT THE FUCK
$xmlns_dc = "http://purl.org/dc/elements/1.1/";
$xmlns_cc = "http://web.resource.org/cc/";
$xmlns_rdf = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
diff --git a/trunk/makefile b/trunk/makefile
new file mode 100644
index 0000000..57df43c
--- /dev/null
+++ b/trunk/makefile
@@ -0,0 +1,30 @@
+INSTDIR=/usr/local
+
+build: frontend backend
+ echo "building"
+
+backend: database
+ # TODO: copy apache configuration
+
+database:
+ # TODO: database setup - use dialog to answer the questions
+ # which database ? (suggested: mysql)
+ # root pasword ? (for setup)
+ # yolanda username ? (suggested: yolanda)
+ # yolanda password ? (will generate random username if none is chosen)
+ dialog --yesno "database stuff" 10 40
+
+frontend: svg2png
+ # TODO: figure out what should go in here
+
+install: build
+ -mkdir "${INSTDIR}/share/yolanda"
+ -mkdir "${INSTDIR}/share/yolanda/www"
+
+remove:
+ rm -rf "${INSTDIR}/share/yolanda"
+ # TODO: kill off database
+
+svg2png:
+ # TODO: figure out how imagemagick works
+
diff --git a/trunk/style/colors/tango.css b/trunk/style/colors/tango.css
index e8875d9..0305d12 100644
--- a/trunk/style/colors/tango.css
+++ b/trunk/style/colors/tango.css
@@ -111,18 +111,6 @@ div.loginbox
border-color: #555753;
}
- div.protip-embed
- {
- }
-
-div#preview
-{
-}
-
- div#preview form
- {
- }
-
div.result
{
}
@@ -133,47 +121,6 @@ div#preview
border-color: #555753;
}
- div.searchbar
- {
- }
-
- div.splashbox
- {
- }
-
- div.tagcloud
- {
- }
-
-
-form
-{
-}
-
- form fieldset
- {
- }
-
- form fieldset input[type="text"]
- {
- }
-
-h1
-{
-}
-
-img
-{
-}
-
- img#logo
- {
- }
-
-li
-{
-}
-
li#latestadditions
{
list-style-image: url(../../images/tango/16x16/actions/document-new.png)
@@ -213,10 +160,6 @@ ul
{
}
- ul#account-actions
- {
- }
-
ul#footer,
ul#header
{
diff --git a/trunk/style/decoration/bridget.css b/trunk/style/decoration/bridget.css
index 8ac04ab..54ac605 100644
--- a/trunk/style/decoration/bridget.css
+++ b/trunk/style/decoration/bridget.css
@@ -37,10 +37,15 @@ a
a.tag
{
- margin-left: 0.25em;
- margin-right: 0.25em;
+ margin-left: 0.25em;
+ margin-right: 0.25em;
}
+code
+{
+ font-family: monospace;
+}
+
div
{
border-style: solid;
diff --git a/trunk/style/structure/fake6.css b/trunk/style/structure/fake6.css
index d1d2433..ee35c10 100644
--- a/trunk/style/structure/fake6.css
+++ b/trunk/style/structure/fake6.css
@@ -94,6 +94,15 @@ div
overflow: visible;
}
+ div.pluginhelp
+ {
+ }
+
+ div.pluginhelp h3
+ {
+ clear: left;
+ }
+
div.protip-embed
{
}
@@ -205,7 +214,12 @@ img
img#logo
{
- float: left;
+ float: left;
+ }
+
+ img.icon-mediaplayer
+ {
+ float: left;
}
li
diff --git a/trunk/upload.pl b/trunk/upload.pl
index 0fa25e5..dca997c 100644
--- a/trunk/upload.pl
+++ b/trunk/upload.pl
@@ -38,7 +38,7 @@ if($userinfo->{'username'})
if($query->param('DC.Title')&&$query->param('DC.Subject')&&$query->param('DC.Description'))
{
- $page->{'innerresults'} = [''];
+ $page->{'results-listing'} = [''];
my @args = ();
diff --git a/trunk/video.pl b/trunk/video.pl
index 912d4b9..529530f 100644
--- a/trunk/video.pl
+++ b/trunk/video.pl
@@ -9,6 +9,7 @@ $session = new CGI::Session;
@page = get_page_array(@userinfo);
+# wtf is this shit ?
if($query->url_param('action') eq 'edit' and $query->url_param('id'))
{
$page->{'message'}->{'type'} = "information";
@@ -51,8 +52,9 @@ if($query->url_param('id'))
}
else
{
- #there is nothing we can do now - this video doesn't exist...
+ # there is nothing we can do now - this video doesn't exist...
print $query->redirect("/index.pl?error=error_no_video");
+ # this is a typical 404 situation, why is there no 404 ?
}
}
elsif($rowcount == 1)
@@ -152,7 +154,7 @@ if($query->url_param('id'))
'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
+# sadly, i dunno how to add multiple tags with the same name
}
}
};
diff --git a/trunk/xsl/xhtml.xsl b/trunk/xsl/xhtml.xsl
index c49794d..18c2161 100755
--- a/trunk/xsl/xhtml.xsl
+++ b/trunk/xsl/xhtml.xsl
@@ -24,6 +24,7 @@
+
diff --git a/trunk/xsl/xhtml/video.xsl b/trunk/xsl/xhtml/video.xsl
index 41d2fac..30e5c04 100644
--- a/trunk/xsl/xhtml/video.xsl
+++ b/trunk/xsl/xhtml/video.xsl
@@ -361,18 +361,12 @@
-
+
+
+
-
+
- 
- 
-