Merge branch 'master-nonedit-da' into master-nonedit-nbmaster-nonedit-nb

2 files changed, 39 insertions, 38 deletions

diff --git a/shortcuts.mdwn b/shortcuts.mdwn
index c629028..6175091 100644
--- a/shortcuts.mdwn
+++ b/shortcuts.mdwn
@@ -27,53 +27,34 @@ Denne side styrer hvilke genveje wikien understøtter.
 * [[!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 detailjer.
-  [[!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 bug #%s"]]
-* [[!shortcut name=fdolist
-  url="http://lists.freedesktop.org/mailman/listinfo/%s"
-  desc="%s@lists.freedesktop.org"]]
-* [[!shortcut name=gnomebug
-  url="http://bugzilla.gnome.org/show_bug.cgi?id=%s" desc="GNOME bug #%s"]]
-* [[!shortcut name=linuxbug
-  url="http://bugzilla.kernel.org/show_bug.cgi?id=%s" desc="Linux bug #%s"]]
-* [[!shortcut name=mozbug
-  url="https://bugzilla.mozilla.org/show_bug.cgi?id=%s" desc="Mozilla bug
-  #%s"]]
-* [[!shortcut name=gnulist url="http://lists.gnu.org/mailman/listinfo/%s"
-  desc="%s@gnu.org"]]
+  * Brug: `\[[!debss package]]`, `\[[!debss package#version]]`, 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 bug #%s"]]
+* [[!shortcut name=fdolist url="http://lists.freedesktop.org/mailman/listinfo/%s" desc="%s@lists.freedesktop.org"]]
+* [[!shortcut name=gnomebug url="http://bugzilla.gnome.org/show_bug.cgi?id=%s" desc="GNOME bug #%s"]]
+* [[!shortcut name=linuxbug url="http://bugzilla.kernel.org/show_bug.cgi?id=%s" desc="Linux bug #%s"]]
+* [[!shortcut name=mozbug url="https://bugzilla.mozilla.org/show_bug.cgi?id=%s" desc="Mozilla bug #%s"]]
+* [[!shortcut name=gnulist url="http://lists.gnu.org/mailman/listinfo/%s" desc="%s@gnu.org"]]
 * [[!shortcut name=marcmsg url="http://marc.info/?i=%s"]]
 * [[!shortcut name=marclist url="http://marc.info/?l=%s"]]
-* [[!shortcut name=gmane url="http://dir.gmane.org/gmane.%s"
-  desc="gmane.%s"]]
+* [[!shortcut name=gmane url="http://dir.gmane.org/gmane.%s" desc="gmane.%s"]]
 * [[!shortcut name=gmanemsg url="http://mid.gmane.org/%s"]]
-* [[!shortcut name=cpan
-  url="http://search.cpan.org/search?mode=dist&query=%s"]]
-* [[!shortcut name=ctan
-  url="http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s"]]
+* [[!shortcut name=cpan url="http://search.cpan.org/search?mode=dist&query=%s"]]
+* [[!shortcut name=ctan url="http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s"]]
 * [[!shortcut name=hoogle url="http://haskell.org/hoogle/?q=%s"]]
 * [[!shortcut name=iki url="http://ikiwiki.info/%S/"]]
 * [[!shortcut name=ljuser url="http://%s.livejournal.com/"]]
-* [[!shortcut name=rfc url="http://www.ietf.org/rfc/rfc%s.txt" desc="RFC
-  %s"]]
+* [[!shortcut name=rfc url="http://www.ietf.org/rfc/rfc%s.txt" desc="RFC %s"]]
 * [[!shortcut name=c2 url="http://c2.com/cgi/wiki?%s"]]
-* [[!shortcut name=meatballwiki
-  url="http://www.usemod.com/cgi-bin/mb.pl?%s"]]
-* [[!shortcut name=emacswiki
-  url="http://www.emacswiki.org/cgi-bin/wiki/%s"]]
+* [[!shortcut name=meatballwiki url="http://www.usemod.com/cgi-bin/mb.pl?%s"]]
+* [[!shortcut name=emacswiki url="http://www.emacswiki.org/cgi-bin/wiki/%s"]]
 * [[!shortcut name=haskellwiki url="http://haskell.org/haskellwiki/%s"]]
-* [[!shortcut name=dict
-  url="http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s"]]
+* [[!shortcut name=dict url="http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s"]]
 * [[!shortcut name=imdb url="http://imdb.com/find?q=%s"]]
-* [[!shortcut name=gpg
-  url="http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s"]]
+* [[!shortcut name=gpg url="http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s"]]
 * [[!shortcut name=perldoc url="http://perldoc.perl.org/search.html?q=%s"]]
-* [[!shortcut name=whois
-  url="http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain"]]
-* [[!shortcut name=cve
-  url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s"]]
+* [[!shortcut name=whois url="http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain"]]
+* [[!shortcut name=cve url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s"]]
 * [[!shortcut name=cia url="http://cia.vc/stats/project/%s"]]
 * [[!shortcut name=ciauser url="http://cia.vc/stats/user/%s"]]
 * [[!shortcut name=flickr url="http://www.flickr.com/photos/%s"]]
diff --git a/style.css b/style.css
index 2e6cdee..5787ef6 100644
--- a/style.css
+++ b/style.css
@@ -30,6 +30,10 @@
 	border-bottom: 0;
 }
 
+div.inlinecontent {
+	margin-top: .4em;
+}
+
 .actions li {
 	display: inline;
 	padding: .2em .4em;
@@ -249,6 +253,22 @@ div.poll {
 	border: 1px solid #aaa;
 }
 
+div.progress {
+	margin-top: 1ex;
+	margin-bottom: 1ex;
+	border: 1px solid #888;
+	width: 400px;
+	background: #eee;
+	color: black !important;
+	padding: 1px;
+}
+div.progress-done {
+	background: #ea6 !important;
+	color: black !important;
+	text-align: center;
+	padding: 1px;
+}
+
 input#openid_url {
 	background: url(wikiicons/openidlogin-bg.gif) no-repeat;
 	background-color: #fff;
@@ -295,7 +315,7 @@ input#searchbox {
 	margin-bottom: 1ex;
 	padding: 1ex 1ex;
 	border: 1px solid #aaa;
-	width: 25%
+	width: 25%;
 	background: white;
 	color: black !important;
 }