Merge branch 'ikiwiki' into da

Conflicts (resolved manually):
	shortcuts.mdwn

2 files changed, 14 insertions, 2 deletions

diff --git a/shortcuts.mdwn b/shortcuts.mdwn
index 6afc6b9..c79dbcb 100644
--- a/shortcuts.mdwn
+++ b/shortcuts.mdwn
@@ -25,8 +25,8 @@ Denne side styrer hvilke genveje wikien understøtter.
 * [[!shortcut name=debpts url="http://packages.qa.debian.org/%s"]]
 * [[!shortcut name=debmsg url="http://lists.debian.org/msgid-search/%s"]]
 * [[!shortcut name=debrt url="https://rt.debian.org/Ticket/Display.html?id=%s"]]
-* [[!shortcut name=debss url="http://snapshot.debian.net/package/%s"]]
-  * Brug: `\[[!debss package]]`, `\[[!debss package#version]]`, eller `\[[!debss package/version]]`.  Se http://snapshot.debian.net for detaljer.
+* [[!shortcut name=debss url="http://snapshot.debian.net/package/%s/"]]
+  * Brug: `\[[!debss package]]` eller `\[[!debss package/version]]`.  Se <http://snapshot.debian.net/> for detaljer.
 * [[!shortcut name=debwiki url="http://wiki.debian.org/%s"]]
 * [[!shortcut name=fdobug url="https://bugs.freedesktop.org/show_bug.cgi?id=%s" desc="freedesktop.org fejl #%s"]]
 * [[!shortcut name=fdolist url="http://lists.freedesktop.org/mailman/listinfo/%s" desc="%s@lists.freedesktop.org"]]
@@ -61,6 +61,10 @@ Denne side styrer hvilke genveje wikien understøtter.
 * [[!shortcut name=ohloh url="http://www.ohloh.net/projects/%s"]]
 * [[!shortcut name=cpanrt url="https://rt.cpan.org/Ticket/Display.html?id=%s" desc="CPAN RT#%s"]]
 * [[!shortcut name=novellbug url="https://bugzilla.novell.com/show_bug.cgi?id=%s" desc="fejl %s"]]
+* [[!shortcut name=ubupkg url="http://packages.ubuntu.com/%s"]]
+* [[!shortcut name=mozillazinekb url="http://kb.mozillazine.org/%s"]]
+* [[!shortcut name=freebsdwiki url="http://wiki.freebsd.org/%s"]]
+* [[!shortcut name=hackage url="http://hackage.haskell.org/package/%s"]]
 
 Tilføj en ny genvej med [[direktivet|ikiwiki/directive]] `shortcut`. I
 webadressen ([[!wikipedia URL]]en) erstattes "%s" med teksten overdraget til
diff --git a/style.css b/style.css
index fcf39be..7bbfe5d 100644
--- a/style.css
+++ b/style.css
@@ -493,3 +493,11 @@ a.openid_large_btn:focus {
 .openid_selected {
 	border: 4px solid #DDD;
 }
+
+.fileupload-content .ui-progressbar {
+	width: 200px;
+	height: 20px;
+}
+.fileupload-content .ui-progressbar-value {
+	background: url(ikiwiki/images/pbar-ani.gif);
+}