Merge lp:~widelands-dev/widelands-website/new-design into lp:widelands-website

[Nasenbaer]

I guess this is kind of the wrong way, but I really wonder, what is missing for a backmerge and an update of the Widelands.org site.

I really liked the new design and the enhancements and I just can't wait to finally see it in full action.

[Nasenbaer (nasenbaer)]

"I guess this is kind of the wrong way" = that I propose to merge, although I did not work on this branch.

[Shevonar (shevonar)]

What is missing IMHO (and I worked on that branch ;):
- Ware sorting in Encyclopedia: I can still do it later and it also requires changes on Widelands code.
- The documentation has changed, I think we should put the new documentation in a folder on the webserver and change the link (Sirver has to do this cause it requires some changes on the Apache server)
- Some cleanups (remove my local settings, remove old files)

Currently I have absolutely no time to work on Widelands or the website, so it might be best to merge it and do the ware sorting later. I can do the cleanups quickly next week maybe.

By the way you can now test this branch on wl.shevonar.com (some uploaded images are missing, because the harddisc of my "server" crashed and I had no backups).

[Nasenbaer (nasenbaer)]

Thanks for the fast answer Shevonar :)!

And please do not feel rushed by my post. Today is the first day since more than a month, that I find some time for Widelands, so... ;)

[lp:~widelands-dev/widelands-website/new-design]

348. By Shevonar on 2012-07-11

Small fixes, removed old stuff

[Shevonar (shevonar)]

I did the cleanup stuff now. So I'd say this branch is ready for testing on alpha.widelands.com. The changes for the documentation is in the Apache configuration only. I have to discuss some things with Sirver for the final migration. Until now you can see the current state at http://wl.shevonar.com as well as on https://wl.shevonar.com. Maybe full SSL support might come to the Widelands website if the server can handle the load. Therefore I made everthing SSL ready (recaptcha, webchat) and this should be tested in different browsers and operating systems. The webchat certificate causes problems in some browsers (Firefox on Windows), but most browsers should be fine and show everything as secure.

[SirVer (sirver)]

This is in my ballbark now. I am in Munich for the forseeable future to look for flats and I have no idea how the internet is there. I hope to get around doing this still this week.

Thanks Matthias!

review: Approve

[SirVer (sirver)]

I finally merged this. I am currently struggling to get it on alpha.widelands.org. Thanks for your work again Shevonar. Please keep it up and I owe you any kind of beverage that you want to drink on the next wihack.

=== modified file 'README.txt'
--- README.txt	2012-01-21 14:06:29 +0000
+++ README.txt	2012-07-11 17:31:35 +0000
@@ -101,6 +101,21 @@
 See also http://docs.djangoproject.com/en/dev/ref/django-admin/#runserver-port-or-address-port
 for further details. 
 
+Setting up the online help / encyclopedia
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+You will need graphviz to generate the graphs for the online help. On Ubunutu run:
+
+   $ sudo apt-get install graphviz
+
+To generate the online help database switch to your local environment and run:
+
+   $ ./manage.py update_help
+
+After that you can create the overview pdf files with
+
+   $ ./manage.py update_help_pdf
+
 Contact
 =======
 

=== modified file 'local_settings.py.sample'
--- local_settings.py.sample	2011-08-25 13:17:20 +0000
+++ local_settings.py.sample	2012-07-11 17:31:35 +0000
@@ -5,7 +5,7 @@
 TEMPLATE_DIRS = bd + '/templates'
 STATIC_MEDIA_PATH = bd + '/media'
 MEDIA_ROOT = bd + '/media/'
-WIDELANDS_SVN_DIR = "/Users/sirver/Desktop/Programming/cpp/widelands/svn_trunk/"
+WIDELANDS_SVN_DIR = "/path/to/widelands/trunk/"
 
 DATABASES = {
    'default': {

=== modified file 'media/css/base.css'
--- media/css/base.css	2011-11-19 17:37:52 +0000
+++ media/css/base.css	2012-07-11 17:31:35 +0000
@@ -1,368 +1,363 @@
-/* HEADER */
-div#headerbanner {
-    background: url(../img/headback.jpg);
-    background-repeat: repeat-x;
-    color: #FFFFFF;
-    text-align: center;
-    height:110px;
-    border-bottom:2px solid #090909;
-}
-
-/***************************************************************/
-/*                         SIDECOLUMNS                         */
-/***************************************************************/
-#leftcolumn, #rightcolumn {
-    background-color: #555555;
-    background-image: url('../img/Menubackground.png');
-    border-left: 1px solid #151515;
-    border-right: 1px solid #090909;
-    border-bottom: 1px solid #090909;
-    padding-top: 4px; /* A small space */
-    vertical-align: top;
-
-}
-/* The content is capsuled in divs, because
- * Firefox is ignoring min-width arguments
- * for tables
- */
-#leftcontent {
-    min-width: 175px;
-}
-#rightcontent { 
-    min-width: 185px;
-}
-
-
-/*
-* Mainmenu
-*/
-#mainmenu { 
-    margin: 0px;
-    padding: 0px;
-} 
-#mainmenu li {
-    list-style-image: url('../img/1.gif'); 
-    list-style-position: inside;
-    font-weight: bold;
-    padding: 4px;
-} 
-#mainmenu .sub {
-    padding-left: 20px;
-    color: red;
-    font-weight: normal;
-}
-
-
-/******************/
-/* CONTENT COLUMN */
-/******************/
-#content {
-    text-align: left;
-    vertical-align: top;
-    padding: 8px;
-    padding-top: 0px;
-    background-color: #000000;
-    background: url(../img/background.png);
-
-    font-size: 12px;
-    color: #D0DFFF;
-    width: 100%;
-}
-
-/****************/
-/* BOTTOM TABLE */
-/****************/
-table#table_bottom {
-    background-color: #333333;
-    background: url(../img/background.png);
-
-    width: 100%;
-}
-td#table_bottomleft {
-    background: url(../img/table_bottomleft.png);
-    background-repeat: no-repeat;
-    background-position: left;
-    height:8px;
-    width:8px;
-}
-
-td#table_bottomright {
-    background: url(../img/table_bottomright.png);
-    background-repeat: no-repeat;
-    background-position: right;
-    height:8px;
-    width:8px;
-}
-
-/**********/
-/* FOOTER */
-/**********/
-#footer {
-    width: 100%;
-    height: 8px;
-    background: url(../img/background.png); 
-}
-
-/*
- * Menu Blocks 
- */
-h3.box_title {
-    color: #D0DFFF;
-    font-weight: bold;
-    font-size: 12px;
-    padding-left: 12px;
-    background-image: url('../img/Navbar.png');
-    background-repeat: repeat-x;
-    border-left: 0px solid #999999;
-    border-right: 0px solid #999999;
-    border-bottom: 0px solid #999999;
-    padding-top: 2px;
-    padding-bottom: 6px;
-    margin: 0px;
-}
-
-div.box_content {
-    font-size:12px;
-    line-height: 120%;
-    border-left: 0px solid #999999;
-    border-right: 0px solid #999999;
-    padding: 6px;
-    padding-top: 0px;
-    padding-bottom: 20px;
-    background-color: #555555;
-    background-image: url('../img/Menubackground.png');
-}
-
-div.box_content .sub_content {
-    margin-bottom: 15px;
-}
-
-.box_content p {
-    margin: 0px;
-    padding: 0px;
-    padding-bottom: 4px;
-}
-
-.box_content h4 {
-    margin: 0px;
-    padding: 0px;
-    padding-bottom: 4px;
-}
-
-.block_center {
-    text-align: center;
-}
-
-/***************************************************************/
-/*                   GENERAL STYLE ELEMENTS                    */
-/***************************************************************/
+/* Common */
+
 body {
-    color: #D0DFFF;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 12px;
-    background-color: #000000;
-    margin: 0;
-    padding: 0;
+	background-color: #e9c78a;
+	background-image: url("../img/parchment.png");
+	font-family: sans-serif;
+	font-size: 14px;
+	line-height: 20px;
+	color: #ffffee;
+	text-shadow: #000000 1px 1px 0px;
 }
 
-img {
-    border: 0px;
+a img {
+	border: none;
 }
 
 a {
-    color: #D0DFFF;
-    text-decoration: none;
-    font-weight: bold;
-    background-color: transparent;
-}
-a.external:before {
-	padding-right: 2px;
-    /* Must be an absolute reference, otherwise some browsers give errors */
-    content: url(/wlmedia/img/external_link.gif);
-}
-a.missing {
-    color: rgb(255, 85, 0);
-} 
-
+	text-decoration: none;
+	color: #ffffee;
+	font-weight: bold;
+}
 
 a:hover {
-    color: #A0AAFF;
-    text-decoration: underline;
-}
-  
-/*
- * Default table layout
- */
-th {
-    font-weight: bold;
-    background-position: left;
-    text-align: left;
-    padding-left: 4px;
-    background-image: url('../img/Navbar.png');
-    background-repeat: repeat-x;
-    height: 20px;
-}
-
-/*
- * Odd Even Tags (mainly for tables)
- */
+	color: #181;
+}
+
+a.invertedColor {
+	color: #181;
+}
+
+a.invertedColor:hover {
+	color: #ffffee;
+}
+
+form {
+	display: inline;
+}
+
+input, button, textarea {
+	margin-bottom: 5px;
+	padding: 2px 10px;
+	border: 1px solid black;
+	border-radius: 10px;
+	background: none;
+	background-image: url("../img/black50.png");
+	outline: none;
+	color: #ffffff;
+	text-shadow: #000000 1px 1px 0px;
+	vertical-align: middle;
+	cursor: pointer;
+	font-family: inherit;
+	font-size: 12px;
+	font-weight: bold;
+}
+
+textarea {
+	font-weight: normal;
+	font-size: 14px;
+}
+
+input:hover, button:hover, textarea:hover {
+	background-image: url("../img/black20.png");
+}
+
+input.radio {
+	background: none;
+	border: none;
+	vertical-align: middle;
+}
+
+h1, h2, h3, h4, h5, h6 {
+	color: #181;
+	margin-top: 0px;
+	font-weight: normal;
+}
+
+svg {
+	text-shadow: none;
+}
+
+td {
+	vertical-align: top;
+	line-height: 20px;
+}
+
+.posLeft {
+	float: left
+}
+
+.posRight {
+	float: right;
+}
+
+.clear {
+	clear: both;
+}
+
+.center  {
+	text-align: center;
+}
+
+.middle {
+	vertical-align: middle;
+}
+
+.grey {
+	color: #998;
+}
+
+.green {
+	color: #181;
+}
+
+.green a {
+	color: #181;
+}
+
+.green a:hover {
+	color: #ffffee;
+}
+.small {
+	font-size: 12px;
+}
+
 .even {
-    background-color: #444444;
-    background: url(../img/background-444.png);
-    padding: 5px;
+	background-image: url("../img/black20.png");
 }
 
 .odd {
-    background-color: #4f4f4f;
-    background: url(../img/background-4F4F4F.png);
-    padding: 5px;
-}
-
-/*
- * Error Handling
- */
+	background-image: url("../img/black50.png");
+}
+
+.placeholder {
+  color: #aaa !important;
+}
+
 .errormessage {
-    color: #ff0000;
-    font-size: 13px;
-}
-
-/* 
- * Search Box
- */
-#id_search {
-    width: 150px; 
-}
-
-/*
- * Events
- */
-.event {
-    text-align: center;
-    width: 100%;
-    padding-bottom: 5px;
-}
-
-.event .date {
-    font-size: 80%
-}
-
-
-/*
- * Box Item Model
- */
-.box_item_model {
-
-}
-
-.border {
-    border: 1px solid rgb(9, 9, 9);
-}
-    
-.full_site {
-    width: 100%;
-}
-
-.fixed_site {
-    width: 540px;
-}
-
-.box_item_model img.news {
-    float: right;
-    padding: 0px;
-    width: 20px;
-}
-
-.box_item_model .border_top {
-    border-top: 1px solid rgb(9, 9, 9);
-}
-
-.box_item_model h3.title {
-    font-weight: bold;
-    font-size: 12px;
-    padding-left: 12px;
-    background-image: url('../img/Navbar.png');
-    background-repeat: repeat-x;
-    border-left: 0px solid #999999;
-    border-right: 0px solid #999999;
-    border-top: 0px solid #999999;
-    padding-top: 2px;
-    padding-bottom: 0px;
-    margin: 0px;
-}
-
-.box_item_model .content {
-    line-height: 120%;
-    border: 0px;
-    padding: 2px;
-    padding-top: 5px;
-    padding-left: 15px;
-    background-color: #3F3F3F;
-    background: url('../img/background-3F3F3F.png');
-}
-
-.box_item_model .info_line {
-    text-align: right;
-    padding: 3px;
-    margin: 0px;
-    background-color: #222222;
-    background: url('../img/background-222.png');
-}
-
-.box_item_model .text {
-   vertical-align: baseline;
-   margin-top: 5px;
-   margin-bottom: 5px;
-   margin: 0px;
-   line-height: 130%;
-}
-
-.box_item_model .text:first-letter {
-    color: #7070FF;
-    font-size: 180%;
-    font-family: Cretino, "Bitstream Vera Serif", serif;
-    font-weight: bold;
-}
-
-.box_item_model .show_right {
-    text-align: right;
-    vertical-align: top;
-}
-
-.box_item_model .show_left {
-    text-align: left;
-    vertical-align: top;
-}
-
-.box_item_model .show_center {
-    text-align: center;
-    vertical-align: top;
-}
-
-.show_center {
-    text-align: center;
-    vertical-align: top;
-}
-.button_send {
-    padding:0;
-    margin:0;
-    border:none;
-    color: #222222;
-    background: url(../forum/img/en/send.png) no-repeat center; 
-    background-repeat: no-repeat;
-    font-size:12px;
-    width:100px;
-    height: 25px;
-    cursor: pointer;
-}
-.button_preview {
-    padding:0;
-    margin:0;
-    border:none;
-    color: #222222;
-    background: url(../forum/img/en/preview.png) no-repeat center; 
-    background-repeat: no-repeat;
-    font-size:12px;
-    width:100px;
-    height: 25px;
-    cursor: pointer;
+	color: #ff0000;
+}
+
+.errormessage ul {
+	margin: 0px;
+}
+
+.noshadow {
+	text-shadow: none;
+}
+
+.italic {
+	font-style: italic;
+}
+
+/* Base */
+
+div#wrapper {
+	min-width: 980px;
+	margin: 0px 20px;
+}
+
+div#header {
+
+}
+
+div #main {
+	min-height: 500px;
+}
+
+div#content {
+	margin-right: 240px;
+}
+
+div#footer {
+	background-color: #695536;
+	background-image: url("../img/wood.png");
+	padding: 15px;
+	margin-top: 20px;
+	text-align: center;
+	box-shadow: black 2px 2px 2px 2px;
+	border: 1px solid #222222;
+	-moz-border-radius-bottomleft: 15px;
+	-moz-border-radius-bottomright: 15px;
+	-khtml-border-radius-bottomleft: 15px;
+	-khtml-border-radius-bottomright: 15px;
+	-webkit-border-bottom-left-radius: 15px;
+	-webkit-border-bottom-right-radius: 15px;
+	border-bottom-left-radius: 15px;
+	border-bottom-right-radius: 15px;
+}
+
+/* Header */
+
+div#header  img{
+	position: relative;
+	z-index: 10;
+}
+
+div.loginBox {
+	width: 320px;
+	height: 90px;
+	border: 1px solid black;
+	background-color: #332f29;
+	background-image: url("../img/but1.png");
+	-moz-border-radius: 15px;
+	-webkit-border-radius: 15px;
+	-khtml-border-radius: 15px;
+	border-radius: 15px;
+	position: relative;
+	z-index: 0;
+	padding: 15px;
+	box-shadow: black 2px 2px 2px 2px;
+}
+
+div.loginBox div.right{
+	width: 120px;
+}
+
+div.loginBox ul {
+	margin: 0px;
+	padding: 0px;
+	list-style-type: none;
+	line-height: 18px;
+}
+
+div.loginBox h4 {
+	margin-bottom: 5px;
+}
+
+div.loginBox input {
+	width: 100px;
+}
+
+div.loginBox button {
+	margin: 0px;
+	padding: 0px;
+	border: 1px solid black;
+	width: 60px;
+	height: 20px;
+	border-radius: 10px;
+	background: none;
+	background-image: url("../img/black50.png");
+	outline: none;
+	color: #ffffff;
+}
+
+/* Right Column */
+
+div#rightColumn {
+	width: 220px;
+}
+
+div.columnModule {
+	width: 220px;
+}
+
+div.columnModule h3 {
+	margin-bottom: 10px;
+}
+
+div.columnModuleBox {
+	width: 220px;
+	margin-bottom: 20px;
+	background-color: #695536;
+	background-image: url("../img/wood.png");
+	border: 1px solid black;
+	box-shadow: black 2px 2px 2px 2px;
+}
+
+div.columnModuleBox h4 {
+	color: #ffffee;
+	padding: 8px;
+	padding-bottom: 0px;
+	margin: 0px;
+}
+
+div.columnModuleBox ul.poll {
+	padding: 8px;
+	list-style-type: disc;
+	border: none;
+}
+
+div.columnModuleBox ul.poll li {
+	padding: 0px;
+	border: none;
+	height: 20px;
+}
+
+div.columnModuleBox p {
+	margin: 0px;
+	padding: 8px;
+}
+
+div.columnModuleBox ul {
+	width: 220px;
+	padding: 0px;
+	margin: 0px;
+	list-style-type: none;
+}
+
+div.columnModuleBox ul.player {
+	padding: 4px;
+	list-style-type: disc;
+}
+
+div.columnModuleBox ul.player li{
+	padding: 4px;
+	border: none;
+}
+
+div.columnModuleBox ul li {
+	display: block;
+	padding: 8px;
+	border-top: 1px solid black;
+	font-size: 12px;
+}
+
+div.columnModuleBox ul li:first-child {
+	border-top: none;
+}
+
+input.donate {
+	border: none;
+	background: none;
+}
+
+/* News Posts */
+
+img.landing {
+	margin-left: 20px;
+	margin-bottom: 15px;
+}
+
+div.blogEntry {
+	background-color: #332f29;
+	background-image: url("../img/but1.png");
+	-moz-border-radius: 15px;
+	-webkit-border-radius: 15px;
+	-khtml-border-radius: 15px;
+	border-radius: 15px;
+	border: 1px solid black;
+	padding: 15px;
+	padding-bottom: 30px;
+	margin-bottom: 20px;
+	box-shadow: black 2px 2px 2px 2px;
+}
+
+div.blogEntry img.title {
+	width: 150px;
+	margin-right: 20px;
+	margin-bottom: 10px;
+}
+
+div.blogEntry p {
+	text-align: justify;
+	margin: 0px;
+	margin-bottom: 10px;
+}
+
+div.blogEntry hr {
+	height: 1px;
+	background: #998;
+	border: none;
+	clear: left;
 }

=== added file 'media/css/base_ielt8.css'
--- media/css/base_ielt8.css	1970-01-01 00:00:00 +0000
+++ media/css/base_ielt8.css	2012-07-11 17:31:35 +0000
@@ -0,0 +1,3 @@
+ul.menu li ul {
+	left: -41px;
+}

=== added file 'media/css/base_ielt9.css'
--- media/css/base_ielt9.css	1970-01-01 00:00:00 +0000
+++ media/css/base_ielt9.css	2012-07-11 17:31:35 +0000
@@ -0,0 +1,9 @@
+ul.menu li a:hover {
+	background-image: url("../img/black50.png");
+}
+
+div.loginBox button {
+	margin: 1px 0px 5px 5px;
+	vertical-align: top;
+	height: 22px;
+}
\ No newline at end of file

=== modified file 'media/css/comments.css'
--- media/css/comments.css	2010-06-12 14:58:31 +0000
+++ media/css/comments.css	2012-07-11 17:31:35 +0000
@@ -2,28 +2,33 @@
  * Comment
  */
 .comment {
-    margin: 0px;
-    padding-bottom: 2px;
-    /*
-     * border: 1px solid rgb(20%,20%,20%);
-     */
-    border-top: 0px;
-    width: 100%;
-}
-.comment p {
-    margin: 0px;
-    margin-bottom: 4px;
-}
-.comment .at {
-   text-align: right;
-   font-size: 90%;
-}
+	border: 1px solid black;
+	padding: 8px;
+	margin-bottom: 5px;
+}
+
+.comment table {
+	border-collapse: collapse;
+	width: 100%;
+}
+
 .comment .author {
-   font-size: 110%;
-   font-style: italic;
-   vertical-align: top;
-   margin-bottom: 5px;
-}
-.text textarea {
-    width: 100%;
+	padding-right: 8px;
+	text-align: center;
+	border-right: 1px solid #998;
+	height: 100%;
+}
+
+.comment .text {
+	padding-left: 8px;
+	width: 100%;
+}
+
+textarea {
+	width: 97%;
+}
+
+.comment .reply_link {
+	vertical-align: bottom;
+	text-align: right;
 }

=== added file 'media/css/documentation.css'
--- media/css/documentation.css	1970-01-01 00:00:00 +0000
+++ media/css/documentation.css	2012-07-11 17:31:35 +0000
@@ -0,0 +1,85 @@
+.sphinx a.headerlink {
+	padding: 0 4px 0 4px;
+	visibility: hidden;
+}
+
+.sphinx *:hover > a.headerlink {
+	visibility: visible; 
+}
+
+/*******************************/
+/* Pygment Syntax Highlighting */
+/*******************************/
+pre {
+	margin: 0px;
+}
+.highlight {
+/*	text-shadow: none;
+/*	color: #000000;*/
+	padding: 4px;
+	border: 1px solid black;
+	background-image: url("../img/black20.png");
+	margin: 4px 0px;
+}
+.highlight .hll { background-color: #ffffcc }
+/*.highlight  { background: #f0f0f0; }*/
+.highlight .c { color: #60a0b0; font-style: italic } /* Comment */
+.highlight .err { border: 1px solid #FF0000 } /* Error */
+.highlight .k { color: #007020; font-weight: bold } /* Keyword */
+.highlight .o { color: #998 } /* Operator */
+.highlight .cm { color: #60a0b0; font-style: italic } /* Comment.Multiline */
+.highlight .cp { color: #007020 } /* Comment.Preproc */
+.highlight .c1 { color: #60a0b0; font-style: italic } /* Comment.Single */
+.highlight .cs { color: #60a0b0; background-color: #fff0f0 } /* Comment.Special */
+.highlight .gd { color: #A00000 } /* Generic.Deleted */
+.highlight .ge { font-style: italic } /* Generic.Emph */
+.highlight .gr { color: #FF0000 } /* Generic.Error */
+.highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */
+.highlight .gi { color: #00A000 } /* Generic.Inserted */
+.highlight .go { color: #808080 } /* Generic.Output */
+.highlight .gp { color: #c65d09; font-weight: bold } /* Generic.Prompt */
+.highlight .gs { font-weight: bold } /* Generic.Strong */
+.highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
+.highlight .gt { color: #0040D0 } /* Generic.Traceback */
+.highlight .kc { color: #007020; font-weight: bold } /* Keyword.Constant */
+.highlight .kd { color: #007020; font-weight: bold } /* Keyword.Declaration */
+.highlight .kn { color: #007020; font-weight: bold } /* Keyword.Namespace */
+.highlight .kp { color: #007020 } /* Keyword.Pseudo */
+.highlight .kr { color: #007020; font-weight: bold } /* Keyword.Reserved */
+.highlight .kt { color: #902000 } /* Keyword.Type */
+.highlight .m { color: #40a070 } /* Literal.Number */
+.highlight .s { color: #4070a0 } /* Literal.String */
+.highlight .na { color: #4070a0 } /* Name.Attribute */
+.highlight .nb { color: #007020 } /* Name.Builtin */
+.highlight .nc { color: #0e84b5; font-weight: bold } /* Name.Class */
+.highlight .no { color: #60add5 } /* Name.Constant */
+.highlight .nd { color: #555555; font-weight: bold } /* Name.Decorator */
+.highlight .ni { color: #d55537; font-weight: bold } /* Name.Entity */
+.highlight .ne { color: #007020 } /* Name.Exception */
+.highlight .nf { color: #aaaa00 } /* Name.Function */
+.highlight .nl { color: #002070; font-weight: bold } /* Name.Label */
+.highlight .nn { color: #0e84b5; font-weight: bold } /* Name.Namespace */
+.highlight .nt { color: #062873; font-weight: bold } /* Name.Tag */
+.highlight .nv { color: #bb60d5 } /* Name.Variable */
+.highlight .ow { color: #007020; font-weight: bold } /* Operator.Word */
+.highlight .w { color: #bbbbbb } /* Text.Whitespace */
+.highlight .mf { color: #40a070 } /* Literal.Number.Float */
+.highlight .mh { color: #40a070 } /* Literal.Number.Hex */
+.highlight .mi { color: #40a070 } /* Literal.Number.Integer */
+.highlight .mo { color: #40a070 } /* Literal.Number.Oct */
+.highlight .sb { color: #4070a0 } /* Literal.String.Backtick */
+.highlight .sc { color: #4070a0 } /* Literal.String.Char */
+.highlight .sd { color: #4070a0; font-style: italic } /* Literal.String.Doc */
+.highlight .s2 { color: #4070a0 } /* Literal.String.Double */
+.highlight .se { color: #4070a0; font-weight: bold } /* Literal.String.Escape */
+.highlight .sh { color: #4070a0 } /* Literal.String.Heredoc */
+.highlight .si { color: #70a0d0; font-style: italic } /* Literal.String.Interpol */
+.highlight .sx { color: #c65d09 } /* Literal.String.Other */
+.highlight .sr { color: #235388 } /* Literal.String.Regex */
+.highlight .s1 { color: #4070a0 } /* Literal.String.Single */
+.highlight .ss { color: #517918 } /* Literal.String.Symbol */
+.highlight .bp { color: #007020 } /* Name.Builtin.Pseudo */
+.highlight .vc { color: #bb60d5 } /* Name.Variable.Class */
+.highlight .vg { color: #bb60d5 } /* Name.Variable.Global */
+.highlight .vi { color: #bb60d5 } /* Name.Variable.Instance */
+.highlight .il { color: #40a070 } /* Literal.Number.Integer.Long */
\ No newline at end of file

=== modified file 'media/css/forum.css'
--- media/css/forum.css	2011-11-13 15:47:39 +0000
+++ media/css/forum.css	2012-07-11 17:31:35 +0000
@@ -1,108 +1,83 @@
-
-.index_category, .index_forum {
-    margin-bottom: 20px;
-    border-left: 0px;
-    border-right: 0px;
-}
-
-.list_overview {
-    display: block;
-    font-weight: bold;
-    padding: 0px;
-    margin-top: 0px;
-    margin-bottom: 0px;
-    background: url('../img/background-444.png');
-}
-
-.title {
-    display: block;
-    font-weight: bold;
-    padding: 5px;
-    margin-top: 5px;
-    margin-bottom: 1px;
-    background: url('../img/background-444.png');
-}
-
-.author {
-   text-align: center;
-}
-
-/*
- * POSTS
- */
-.posts {
-   padding: 0px;
-   margin: 0px;
-}
-.posts th {
-   margin-top: 0px;
-   margin-bottom: 0px;
-   height: auto;
-}
-
-/* 
- * Post
- */
-.post {
-   background-color: rgb(20%,20%,20%); 
-   margin: 0px;
-   padding-bottom: 2px;
-}
+.forum {
+	border: none; 
+	border-collapse: collapse;
+	width: 100%;
+}
+
+.forum tr {
+	border: 1px solid black;
+}
+
+.forum thead tr {
+	border: none;
+}
+
+.forum td {
+	vertical-align: middle;
+	padding: 8px;
+}
+
+.forumIcon {
+	width: 50px;
+}
+
+.forumTitle {
+	width: 40%;
+}
+
+.forumCount {
+	width: 120px;
+}
+
+.lastPost {
+	text-align: right;
+}
+
+.forum .author {
+	width: 140px;
+	text-align: center;
+	border-right: 1px solid black;
+	vertical-align: top;
+}
+
+.forum .post {
+	vertical-align: top;
+}
+
+.authorStats {
+	text-align: left;
+	font-size: 10px;
+	line-height: 12px;
+}
+
+tr.spacer {
+	height: 10px;
+	border: none;
+}
+
 .post p {
-    margin: 8px 0px 8px;
-    padding: 0px;
+	margin: 0px;
+	margin-bottom: 8px;
+	padding: 0px;
 }
 
-.post .at {
-   text-align: right;
-   font-size: 90%;
-}
-.post .userinfo {
-   font-size: 90%;
-   vertical-align: top;
-}
-.post .odd {
-   margin: 0px;
-   padding: 0px;
-}
-.post table {
-   border-collapse: collapse;
-}
-.post td {
-   border: 1px solid rgb(20%,20%,20%); 
-}
 .post blockquote {
-   background: rgb(51, 51, 51);
-   border: 0px inset rgb(0, 0, 128);
-   font-family: 'Courier New', Courier, monospace;
-   padding: 0px 6px 6px 6px;
-   margin: 2px;
-   margin-left: 10px;
-}
-.post .tools {
-   vertical-align: bottom;
-}
-.first_post {
-   padding-bottom: 20px;
-   border: 1px solid rgb(100,100,100);
-   margin-bottom: 20px;
-}
-.post .avatar {
-    width: 100%;
-    padding: 2px;
-}
-.post .top {
-    vertical-align: top;
-}
-.post .top .signature .line {
-    color: #D0DFFF;
-    font-weight: bolder;
-}
-
-
-/*
- * Compose
- */
+	background-image: url("../forum/img/quote.png");
+	background-repeat: no-repeat;
+	background-position: 4px 4px;
+	border: 1px solid black;
+	padding: 4px;
+	padding-left: 28px;
+	margin: 4px;
+}
+
+.preview-box .content {
+	background-image: url("../img/black50.png");
+	border: 1px solid black;
+	padding: 4px;
+	width: 98%;
+}
+
 .post-form #id_subject {
     width: 40%;
 }
@@ -111,14 +86,16 @@
 }
 .post-form #id_body {
    width: 98%;
+   max-width: 98%;
    height: 150px;
 }
-.post .bold  {
-    font-weight: bold;
-}
-.post .underline {
-    text-decoration: underline;
-}
-.post .italic {
-    font-style: italic;
+
+a.permalink {
+	width: 16px;
+	height: 20px;
+	background-image: url("../forum/img/permalink.png");
+}
+
+a.permalink:hover {
+	background-image: url("../forum/img/permalink_hover.png");
 }

=== added file 'media/css/help.css'
--- media/css/help.css	1970-01-01 00:00:00 +0000
+++ media/css/help.css	2012-07-11 17:31:35 +0000
@@ -0,0 +1,25 @@
+table.help {
+	width: 100%;
+	border-collapse: collapse;
+	margin-bottom: 20px;
+}
+
+table.help tr {
+	
+}
+
+table.help th {
+	padding: 4px;
+	font-weight: normal;
+	font-size: 12px;
+	text-align: left;
+}
+
+table.help td {
+	padding: 4px;
+	border: 1px solid black;
+}
+
+img.icon {
+	margin: 0px 10px 10px 0px;
+}
\ No newline at end of file

=== modified file 'media/css/maps.css'
--- media/css/maps.css	2009-04-11 15:21:15 +0000
+++ media/css/maps.css	2012-07-11 17:31:35 +0000
@@ -1,26 +1,27 @@
-
-#map_list {
-    padding: 5px;
-}
-
-h1 {
-    display: block;
-    font-weight: bold;
-    padding: 5px;
-    margin-top: 5px;
-    margin-bottom: 1px;
-    background: url('../img/background-444.png');
-}
-
-.map_details .author {
-    display: block;
-}
-.map_details .uploader {
-    display: block;
-    margin-bottom: 10px; 
-}
-
-/* Modified css for jqModal */
-div.jqmDialog {
-    width: 480px;
-}
+img.minimap {
+	max-height: 250px;
+}
+
+img.map {
+	margin: 0px 10px 10px 0px;
+}
+
+.forum table td {
+	padding: 2px;
+}
+
+.forum td {
+	vertical-align: top;
+}
+
+.forum .spacer {
+	width: 15px;
+}
+
+p {
+	vertical-align: top;
+}
+
+textarea {
+	width: 97%;
+}
\ No newline at end of file

=== modified file 'media/css/messages.css'
--- media/css/messages.css	2011-04-10 18:50:34 +0000
+++ media/css/messages.css	2012-07-11 17:31:35 +0000
@@ -1,74 +1,36 @@
-
-
-h1 {
-    display: block;
-    font-weight: bold;
-    padding: 5px;
-    margin-top: 5px;
-    margin-bottom: 1px;
-    background: url('../img/background-444.png');
-}
-
-/*
- * MESSAGES
- */
-.messages {
-    margin-bottom: 20px;
-    width: 100%;
-}
-.messages {
-   padding: 0px;
-   margin: 0px;
-}
 .messages th {
-   margin-top: 4px;
-   margin-bottom: 2px;
-}
-
-/* 
- * Post
- */
-.message {
-   background-color: rgb(20%,20%,20%); 
-   margin: 0px;
-   padding-bottom: 2px;
-   border-top: 0px;
-}
-.message .odd {
-   margin: 0px;
-   padding: 0px;
-}
-.message_display {
-  background: url('../img/background-3f3f3f.png');
-  padding-bottom: 1px;
-}
-.message_display .content {
-   background: url('../img/background-222.png');
-   font-family: 'Courier New', Courier, monospace;
-   padding: 10px;
-   margin: 10px;
-}
-
-/*
- * Compose
- */
-#id_recipient {
-    width: 40%;
-}
-#id_subject {
-    width: 40%;
-}
-#id_body {
-   width: 98%;
-   height: 200px;
-}
-
-/*
- * MessageBox style
- */
-
-.message_image img {
-   float: right;   
-   padding: 0px;
-   margin-left: 20px;
+	border: 1px solid black;
+	font-size: 12px;
+	text-align: left;
+	font-weight: normal;
+	background-image: url("../img/black50.png");
+	padding: 4px;
+}
+
+.messages {
+	width: 100%;
+	border-collapse: collapse;
+}
+
+.messages td {
+	padding: 4px;
+}
+
+th.msg_menu {
+	width: 130px;
+	vertical-align: top;
+}
+
+td.msg_box {
+	padding-top: 0px;
+}
+
+.messages ul {
+	padding: 0px;
+	margin: 0px;
+	list-style-type: none;
+}
+
+.messages textarea {
+	width: 100%;
 }

=== removed file 'media/css/modal_windows.css'
--- media/css/modal_windows.css	2009-04-11 15:21:15 +0000
+++ media/css/modal_windows.css	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-
-.modalOverlay {
-    background: black;
-}
-
-div.jqmDialog {
-    display: none;
-    position: absolute;
-   
-    overflow: hidden;
-    padding: 0px;
-    
-    top: 0px; /* Positions are calculated on show */
-    left: 0px;
-   
-    border: 1px solid #000;
-}
-
-div.jqmDialog .jqmClose {
-  position: absolute;
-  cursor: pointer;
-  right: 2px;
-  top: 1px;
-}
-  
-.jqmDialog .box_title h3 {
-    padding-bottom: 3px;
-}
-div.jqDrag {cursor: move;}
-
-div.jqmDialog img.jqResize {position: absolute; right: 2px; bottom: 2px;}
-
-.jqmOverlay { background-color: #000; }
-
-

=== modified file 'media/css/navigation.css'
--- media/css/navigation.css	2011-07-03 18:14:07 +0000
+++ media/css/navigation.css	2012-07-11 17:31:35 +0000
@@ -1,60 +1,111 @@
-div.dropdown {
-	width: auto;
-	min-width: 920px;
-	height: 20px;
+/* Top Menu */
+
+div.searchBox {
+	height: 20px;
+	padding: 15px;
+}
+
+div.searchBoxInner {
+	border: 1px solid black;
+	width: 150px;
+	padding: 0px 10px 0px 10px;
+	height: 20px;
+	border-radius: 10px;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+	-khtml-border-radius: 10px;
+	background-color: #332f29;
+	background-image: url("../img/but1.png");
+}
+
+input.searchField {
+	margin: 0px;
+	border: none;
+	background: none;
+	width: 150px;
+	outline: none;
+	color: #ffffff;
+	padding: 0px;
+}
+
+div#topmenu {
+	position: relative;
+	z-index: 5;
+	top: -30px;
+	clear: both;
+	height: 50px;
+	background-color: #695536;
+	background-image: url("../img/wood.png");
+	border: 1px solid #222222;
+	box-shadow: black 2px 2px 2px 2px;
+}
+
+ul.menu {
+	margin: 0px;
+	padding: 0px;
+}
+
+ul.menu li {
+	list-style-type: none;
+	float: left;
+	position: relative;
+}
+
+ul.menu  li a {
+	display: block;
+	width: 120px;
+	height: 50px;
+	line-height: 50px;
+	float: left;
+	border-right: 1px solid #222222;
+	text-align: center;
+	vertical-align: middle;
+	color: #ffffff;
+	text-transform: uppercase;
+	font-weight: normal;
+}
+
+ul.menu li a:hover {
+	box-shadow: black 0px 0px 10px 0px inset;
+}
+
+ul.menu li a.active {
+	box-shadow: black 0px 0px 10px 0px inset;
+	background-image: url("../img/black50.png");
+}
+
+ul.menu li ul {
+	display: none;
+	position: absolute;
+	top: 50px;
+	left: -1px;
+	background-color: #695536;
+	background-image: url("../img/wood.png");
+	padding: 0px;
+	border: 1px solid #222222;
+	box-shadow: black 2px 2px 2px 2px;
+}
+
+ul.menu li:hover ul {
+	display: block;
+}
+
+ul.menu li ul li {
+	clear: both;
+	border-top: 1px solid #222222;
+}
+
+ul.menu li ul li a {
+	display: block;
+	width: 250px;
+	height: 20px;
+	line-height: 20px;
+	padding: 4px;
 	text-align: left;
-	position:relative;
-	z-index:2;
-}
-
-div.dropdown ul {
-	padding: 0;
-	margin: 0;
-    background-image: url(../img/Navbar.png);
-    background-repeat: repeat-x;
-}
-
-div.dropdown li{
-	list-style: none;
-	position: relative;
-	white-space: nowrap;
-}
-
-div.dropdown a {
-    display: block;
-    text-decoration: none;
-    padding: 3px 20px;
-}
-
-div.dropdown > ul > li{
-	display: inline-block;
-}
-
-div.dropdown li ul {
-/* Positions and hides submenus. */
-	position: absolute;
-	top: 19px;
-	visibility: hidden;
-	border: 1px solid rgb(12,12,12);
-    background-image: url(../img/background-4A4A4A.png);
-    background-repeat: repeat;
-}
-
-div.dropdown li li {
-	 border-bottom: 1px solid rgb(54,54,54);
-}
-
-div.dropdown li:hover > ul {
-	visibility: visible;
-}
-
-div.arrow-down {
-	position: relative;
-	top: -12px;
-	left: +20px;
-	width: 0;
-	height: 0;
-	border-left: 5px solid transparent;
-	border-right: 5px solid transparent;
-	border-top: 5px solid #D0DFFF;
+	font-size: 12px;
+	border: none;
+}
+
+ul.menu li ul li:first-child {
+	border: none;
 }

=== modified file 'media/css/news.css'
--- media/css/news.css	2010-10-30 18:33:48 +0000
+++ media/css/news.css	2012-07-11 17:31:35 +0000
@@ -1,68 +0,0 @@
-/**************************/
-/* General Style elements */
-/**************************/
-.text h1 {
-    font-size: 2.5em;
-    margin: 10px 0px;
-}
-.text h2 {
-    font-size: 2em;
-    margin: 25px 0px 10px;
-    line-height: 70%;
-}
-.text h3 {
-    font-size: 1.4em;
-    margin: 5px 0px;
-}
-.text h4 {
-    font-size: 1.30em;
-    margin: 5px 0px;
-    /*
-     * text-decoration: underline; 
-     * */
-}
-.text h5 {
-    font-size: 1.2em;
-    margin: 5px 0px;
-    /*
-     * text-decoration: underline;
-     * font-style: italic;
-     * */
-}
-.text h6 {
-    font-size: 1.1em; 
-    margin: 5px 0px;
-    /*
-     * font-style: italic;
-     * */
-}
-
-.text h1:first-letter,.text h2:first-letter,.text h3:first-letter,.text h4:first-letter,.text h5:first-letter {
-     vertical-align: baseline;
-     color: #7070FF;
-     font-size: 180%;
-     font-family: Cretino, "Bitstream Vera Serif", serif;
-     font-weight: bold;
-}
-.text h3:first-letter {
-    color: rgb(156,156,86);
-}
-.text h4:first-letter {
-    color: rgb(156,86,156);
-    font-size: 150%;
-}
-.text h5:first-letter {
-    color: rgb(86,156,156);
-    font-size: 120%;
-}
-.news_poster { 
-    font-size: 90%;
-}
-.news_post_date { 
-    font-size: 90%;
-}
-.news_image img {
-    float:right;
-    margin-left:20px;
-    padding:0;
-}

=== modified file 'media/css/notice.css'
--- media/css/notice.css	2010-06-12 15:25:46 +0000
+++ media/css/notice.css	2012-07-11 17:31:35 +0000
@@ -1,12 +1,30 @@
-.notice_poster { 
-    font-size: 90%;
-}
-.notice_post_date { 
-    font-size: 90%;
-}
-.notice_unseen_notice {
-    font-style: italic;
-}
-.notice_type {
-    font-weight: bold;
+.notifications {
+	width: 100%;
+	border-collapse: collapse;
+}
+
+.notifications td {
+	border: 1px solid black;
+	padding: 4px;
+	vertical-align: middle;
+}
+
+.notifications th {
+	border: none;
+	padding: 4px;
+	padding-top: 20px;
+	text-align: left;
+	font-weight: normal;
+}
+
+.notifications .type {
+	width: 20%;
+}
+
+.notifications .text{
+	width: 60%;
+}
+
+.notifications .date {
+	width: 20%;
 }

=== removed file 'media/css/old_xoops_remainings.css'
--- media/css/old_xoops_remainings.css	2011-03-17 16:26:02 +0000
+++ media/css/old_xoops_remainings.css	1970-01-01 00:00:00 +0000
@@ -1,318 +0,0 @@
-input.formButton {}
-
-	.item { border: 0px solid #A0AAFF;}
-
-	.itemHead {
-	 padding: 2px;
-	 background-color: #444444;
-	 background: url(../img/background-444.png);
-	 /*height: 20px; - don't know why i set this ;) */
-	 color: #A0AAFF;
-	}
-	
-	.itemInfo {
-	 text-align: right;
-	 padding: 3px;
-	 background-color: #222222;
-	 background: url(../img/background-222.png);
-	}
-	
-	.itemTitle a {
-	 font-size: 120%;
-	 font-weight: bold;
-	 background-color: transparent;
-	}
-	
-	.itemPoster { font-size: 90%;}
-	.itemPostDate { font-size: 90%;}
-	.itemStats { font-size: 90%;}
-
-	.itemBody { 
-	 padding-left: 15px;
-	 background-color: #3F3F3F;
-	 background: url(../img/background-3F3F3F.png);
-	}
-	
-	.itemText {
-	 margin-top: 5px;
-	 margin-bottom: 5px;
-	 line-height: 130%;
-	}
-	
-	.itemText:first-letter {
-	 color: #7070FF;
-	 font-size: 180%;
-	 font-family: Cretino, "Bitstream Vera Serif", serif;
-	 font-weight: bold;
-	}
-	
-	.itemFoot {
-	 text-align: right;
-	 padding: 3px;
-	 background-color: #222222;
-	 background: url(../img/background-222.png);
-	}
-	
-	.itemAdminLink { font-size: 90%;}
-	.itemPermaLink { font-size: 90%;}
-
-
-
-
-
-	.outer { 
-	 background-color: #4A4A4A;
-	 background: url(../img/background-4A4A4A.png);
-	 border-left: 1px solid #090909;
-	 border-top: 1px solid #090909;
-	 border-right: 1px solid #090909;
-	 border-bottom: 1px solid #090909;
-	}
-
-	.head {
-	 font-weight: bold;
-	 background-position: left;
-	 height: 24px;
-	 line-height: 22px;
-	 text-align: center;
-	 background-color: #444444;
-	 background: url(../img/background-444.png);
-	 height: 20px;
-	}
-
-	.foot {
-	 padding: 5px;
-	 font-weight: bold;
-	 background-color: #222222;
-	 background: url(../img/background-222.png);
-	}
-
-
-
-
-	tr.head {
-	 color: #A0AAFF;
-	 height: 20px;
-	}
-
-	tr.even td {
-	 background-color: transparent;
-	 padding: 5px;
-	}
-
-	tr.odd td {
-	 background-color: transparent;
-	 padding: 5px;
-	}
-
-
-
-
-	.footer {
-	 color: #D0DFFF;
-	 font-size: 12px;
-	 text-align: center;
-	}
-
-	.footer a { color: #A0AAFF;}
-
-
-
-	div.errorMsg {
-	 background-color: #FFCCCC;
-	 text-align: center;
-	 border-top: 0px solid #222222;
-	 border-left: 0px solid #222222;
-	 border-right: 0px solid #444444;
-	 border-bottom: 0px solid #444444;
-	 font-weight: bold;
-	 padding: 12px;
-	}
-
-	div.confirmMsg {
-	 background-color: #333333;
-	 color: #D0DFFF;
-	 text-align: center;
-	 border-top: 0px solid #222222;
-	 border-left: 0px solid #222222;
-	 border-right: 0px solid #444444;
-	 border-bottom: 0px solid #444444;
-	 font-weight: bold;
-	 padding: 12px;
-	}
-
-	div.resultMsg {
-	 background-color: #CCCCCC;
-	 color: #FFFFFF;
-	 text-align: center;
-	 border-top: 0px solid silver;
-	 border-left: 0px solid silver;
-	 font-weight: bold;
-	 border-right: 0px solid #666666;
-	 border-bottom: 0px solid #666666;
-	 padding: 12px;
-	}
-
-	div.xoopsCode {
-	 background: #333333;
-	 border: 0px inset #000080;
-	 font-family: "Courier New",Courier,monospace;
-	 padding: 0px 6px 6px 6px;
-	}
-
-	div.xoopsQuote {
-	 background: #333333;
-	 border: 0px inset #000080;
-	 font-family: "Courier New",Courier,monospace;
-	 padding: 0px 6px 6px 6px;
-	}
-
-	.com_bl {
-	 padding: 2px;
-	 background-color: #3F3F3F;
-	 background: url(../img/background-3F3F3F.png);
-	 border-left: 1px solid #090909;
-	 border-top: 1px solid #090909;
-	 border-right: 1px solid #090909;
-	 border-bottom: 1px solid #090909;
-	}
-
-	.comTitle {
-	 font-size: 16px;
-	 font-weight: bold;
-	 text-align: left;
-	 padding: 3px;
-	 background-color: #222222;
-	 background: url(../img/background-222.png);
-	 border-bottom: 1px solid #090909;
-	}
-
-	.comText {
-	 background-color: #444444;
-	 background: url(../img/background-444.png);
-	 padding: 5px;
-	 border-top: 1px solid #333333;
-	}
-
-	.comUserStat {
-	 font-size: 12px;
-	 color: #A0AAFF;
-	 font-weight:bold;
-	 border: 0px solid silver;
-	 background-color: #333333;
-	 margin: 2px;
-	 padding: 2px;
-	}
-
-	.comUserStatCaption { font-weight: normal;}
-
-	.comUserStatus {
-	 margin-left: 2px;
-	 margin-top: 12px;
-	 color: #A0AAFF;
-	 font-weight:bold;
-	 font-size: 12px;
-	}
-
-	.comUserRank { margin: 2px;}
-
-	.comUserRankText {
-	 font-size: 12px;
-	 font-weight:bold;
-	}
-
-	.comUserRankImg { border: 0px;}
-	.comUserName {}
-	.comUserImg { margin: 2px;}
-
-	.comDate {
-	 font-weight: normal;
-	 font-style: italic;
-	 font-size: smaller;
-	}
-
-	.comDateCaption {
-	 font-weight: bold;
-	 font-style: normal;
-	}
-
-
-
-
-
-
-.mediawiki {
-     background-color : #222222;
-	 background: url(../img/background-222.png);
-	 border-top-width : 2px; 
-	 border-right-width : 1px; 
-	 border-bottom-width : 1px; 
-	 border-left-width : 2px;
-	 border-color : #090909;  
-	 padding: 8px;
-}
-
-.mediawikitable {
-	 background-color: #444444;
-	 background: url(../img/background-444.png);
-}
-
-
-table.diff {
-	 background-color: #444444;
-	 background: url(../img/background-444.png);
-}
-
-td.diff-otitle {
-	 background-color : #333333;
-	 background: url(../img/background.png);
-}
-
-td.diff-ntitle {
-	 background-color : #333333;
-	 background: url(../img/background.png);
-}
-
-td.diff-addedline {
-	 background-color : #222222;
-	 background: url(../img/background-222.png);
-	 font-size: 94%;
-}
-
-td.diff-deletedline {
-	 background-color : #222222;
-	 background: url(../img/background-222.png);
-	 font-size: 94%;
-}
-
-td.diff-context {
-	 background-color : #333333;
-	 background: url(../img/background.png);
-	 font-size: 94%;
-}
-
-span.diffchange { color: #CC2222; font-weight: bold; }
-
-
-
-/* color -- dropdown menu for Forum */
-div.dropdown a, div.dropdown .menubar a{
-	 color: #D0DFFF;
-}
-
-div.dropdown .menu, div.dropdown .menubar, div.dropdown .item, div.dropdown .separator{
-	 background-color: #444444; /* color set in your theme/style.ss .th{} is recommended */
-	 color: #D0DFFF; 
-}
-
-div.dropdown .separator{
-	border: 1px inset #aabbcc;
-}
-
-div.dropdown .menu a:hover, div.dropdown .userbar a:hover{
-	color: #aabbcc;
-}
-/* color - end */
-
-
-

=== modified file 'media/css/profile.css'
--- media/css/profile.css	2010-06-12 16:05:19 +0000
+++ media/css/profile.css	2012-07-11 17:31:35 +0000
@@ -1,11 +1,3 @@
-.profile_poster { 
-    font-size: 90%;
-}
-.profile_post_date { 
-    font-size: 90%;
-}
-.profile_image img {
-   float: right;   
-   padding: 0px;
-   margin-left: 20px;
-}
+td {
+	padding: 4px;
+}
\ No newline at end of file

=== modified file 'media/css/screens.css'
--- media/css/screens.css	2009-04-11 19:14:49 +0000
+++ media/css/screens.css	2012-07-11 17:31:35 +0000
@@ -1,22 +1,7 @@
-.category {
-    font-weight: bold;
-    padding: 5px;
-    margin-top: 5px;
-    margin-bottom: 1px;
-    background: url('../img/background-444.png');
-}
-
-.image_display {
-    margin: 4px 0px;
-}
-
-.sizes {
-    text-align: right;
-    font-size: 100%;
-}
-
 .screenshot_list {
     list-style-type: none;
+	margin: 0px;
+	padding: 0px;
 }
 
 .screenshot_list li {

=== modified file 'media/css/search.css'
--- media/css/search.css	2009-03-23 20:34:20 +0000
+++ media/css/search.css	2012-07-11 17:31:35 +0000
@@ -1,22 +0,0 @@
-
-
-.search h1 {
-    display: block;
-    font-weight: bold;
-    padding: 5px;
-    margin-top: 5px;
-    margin-bottom: 1px;
-    background: url('../img/background-444.png');
-}
-
-.search ul {
-   list-style: none; 
-}
-
-.search .results .wiki {
-   margin-bottom: 2px;
-}
-
-.posted {
-   font-size: 80%;
-}

=== modified file 'media/css/wiki.css'
--- media/css/wiki.css	2010-01-03 21:51:19 +0000
+++ media/css/wiki.css	2012-07-11 17:31:35 +0000
@@ -1,96 +1,57 @@
-/**************************/
-/* General Style elements */
-/**************************/
-.wiki_article h1 {
-    font-size: 2.5em;
-    margin: 10px 0px;
-}
-.wiki_article h2 {
-    font-size: 2em;
-    margin: 25px 3px 10px;
-    line-height: 70%;
-}
-.wiki_article h3 {
-    font-size: 1.4em;
-    margin: 5px 5px;
-}
-.wiki_article h4 {
-    font-size: 1.30em;
-    margin: 5px 10px;
-    text-decoration: underline;
-}
-.wiki_article h5 {
-    font-size: 1.2em;
-    margin: 5px 10px;
-    text-decoration: underline;
-    font-style: italic;
-}
-.wiki_article h6 {
-    font-size: 1.1em; 
-    margin: 5px 10px;
-    font-style: italic;
-}
-
-.wiki_article h1:first-letter,.wiki_article h2:first-letter,.wiki_article h3:first-letter {
-     vertical-align: baseline;
-	 color: #7070FF;
-	 font-size: 180%;
-	 font-family: Cretino, "Bitstream Vera Serif", serif;
-	 font-weight: bold;
-}
-.wiki_article h3:first-letter {
-    color: rgb(156,156,86);
-}
-
-.wiki_article p {
-    margin: 7px 10px; 
-}
-
+.toc {
+	border: 1px solid black;
+	display: inline-block;
+	padding: 0px 8px;
+	background-image: url("../img/black50.png");
+	font-size: 12px;
+	margin-bottom: 20px;
+	line-height: 18px;
+}
+
+.toc ul {
+	padding-left: 20px;
+}
 
 /***********/
 /* History */
 /***********/
 .history_list {
-    width: 100%;
+	width: 100%;
+	border-collapse: collapse;
+}
+
+.history_list  td {
+	border: 1px solid black;
+	padding: 4px;
+}
+
+.history_list th {
+	border: 1px solid black;
+	background-image: url("../img/black50.png");
+	padding: 4px;
 }
 
 /******************/
 /* Edit Wiki Page */
 /******************/
 #edit_wiki_page_form {
-    width: 100%;
+	width: 100%;
 }
+
 #edit_wiki_page_form th {
-    background: None;
-    margin-top: 15px;
-    width: auto;
+	text-align: left;
 }
+
 #edit_wiki_page_form #id_title,#id_comment {
-    width: 100%;
+	width: 98%;
 }
-    
+
 #id_content {
-   width: 100%;
-   height: 400px;
+	width: 98%;
+	height: 400px;
 }
+
 #id_summary {
-   width: 100%;
-   height: 100px;
-}
-
-/*************/
-/* Changeset */
-/*************/
-
-.changeset_content {
-	line-height: 120%;
-	border: 0px;
-	padding: 2px;
-	padding-top: 5px;
-	padding-left: 15px;
-	background-color: #3F3F3F;
-	background: url(../img/background-3F3F3F.png);
-}
-
-
-
+	width: 98%;
+	height: 100px;
+}

=== added directory 'media/fancybox'
=== added file 'media/fancybox/blank.gif'
Binary files media/fancybox/blank.gif	1970-01-01 00:00:00 +0000 and media/fancybox/blank.gif	2012-07-11 17:31:35 +0000 differ
=== added file 'media/fancybox/fancybox_loading.gif'
Binary files media/fancybox/fancybox_loading.gif	1970-01-01 00:00:00 +0000 and media/fancybox/fancybox_loading.gif	2012-07-11 17:31:35 +0000 differ
=== added file 'media/fancybox/fancybox_sprite.png'
Binary files media/fancybox/fancybox_sprite.png	1970-01-01 00:00:00 +0000 and media/fancybox/fancybox_sprite.png	2012-07-11 17:31:35 +0000 differ
=== added directory 'media/fancybox/helpers'
=== added file 'media/fancybox/helpers/fancybox_buttons.png'
Binary files media/fancybox/helpers/fancybox_buttons.png	1970-01-01 00:00:00 +0000 and media/fancybox/helpers/fancybox_buttons.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/fancybox/helpers/jquery.fancybox-buttons.css'
--- media/fancybox/helpers/jquery.fancybox-buttons.css	1970-01-01 00:00:00 +0000
+++ media/fancybox/helpers/jquery.fancybox-buttons.css	2012-07-11 17:31:35 +0000
@@ -0,0 +1,85 @@
+#fancybox-buttons {
+	position: fixed;
+	left: 0;
+	width: 100%;
+	z-index: 8050;
+}
+
+#fancybox-buttons.top {
+	top: 10px;
+}
+
+#fancybox-buttons.bottom {
+	bottom: 10px;
+}
+
+#fancybox-buttons ul {
+	display: block;
+	width: 170px;
+	height: 30px;
+	margin: 0 auto;
+	padding: 0;
+	list-style: none;
+	background: #111;
+	-webkit-box-shadow: 0 1px 3px #000,0 0 0 1px rgba(0,0,0,.7),inset 0 0 0 1px rgba(255,255,255,.05);
+	-moz-box-shadow: 0 1px 3px #000,0 0 0 1px rgba(0,0,0,.7),inset 0 0 0 1px rgba(255,255,255,.05);
+	background: #111 -webkit-gradient(linear,0% 0%,0% 100%,from(rgba(255,255,255,.2)),color-stop(.5,rgba(255,255,255,.15)),color-stop(.5,rgba(255,255,255,.1)),to(rgba(255,255,255,.15)));
+	background: #111 -moz-linear-gradient(top,rgba(255,255,255,.2) 0%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.1) 50%,rgba(255,255,255,.15) 100%);
+	border-radius: 3px;
+}
+
+#fancybox-buttons ul li {
+	float: left;
+	margin: 0;
+	padding: 0;
+}
+
+#fancybox-buttons a {
+	display: block;
+	width: 30px;
+	height: 30px;
+	text-indent: -9999px;
+	background-image: url('fancybox_buttons.png');
+	background-repeat: no-repeat;
+	outline: none;
+}
+
+#fancybox-buttons a.btnPrev {
+	width: 32px;
+	background-position: 6px 0;
+}
+
+#fancybox-buttons a.btnNext {
+	background-position: -33px 0;
+	border-right: 1px solid #3e3e3e;
+}
+
+#fancybox-buttons a.btnPlay {
+	background-position: 0 -30px;
+}
+
+#fancybox-buttons a.btnPlayOn {
+	background-position: -30px -30px;
+}
+
+#fancybox-buttons a.btnToggle {
+	background-position: 3px -60px;
+	border-left: 1px solid #111;
+	border-right: 1px solid #3e3e3e;
+	width: 35px
+}
+
+#fancybox-buttons a.btnToggleOn {
+	background-position: -27px -60px;
+}
+
+#fancybox-buttons a.btnClose {
+	border-left: 1px solid #111;
+	width: 38px;
+	background-position: -57px 0px;
+}
+
+#fancybox-buttons a.btnDisabled {
+	opacity : 0.5;
+	cursor: default;
+}
\ No newline at end of file

=== added file 'media/fancybox/helpers/jquery.fancybox-buttons.js'
--- media/fancybox/helpers/jquery.fancybox-buttons.js	1970-01-01 00:00:00 +0000
+++ media/fancybox/helpers/jquery.fancybox-buttons.js	2012-07-11 17:31:35 +0000
@@ -0,0 +1,115 @@
+ /*!
+ * Buttons helper for fancyBox
+ * version: 1.0.2
+ * @requires fancyBox v2.0 or later
+ *
+ * Usage: 
+ *     $(".fancybox").fancybox({
+ *         buttons: {
+ *             position : 'top'
+ *         }
+ *     });
+ * 
+ * Options:
+ *     tpl - HTML template
+ *     position - 'top' or 'bottom'
+ * 
+ */
+(function ($) {
+	//Shortcut for fancyBox object
+	var F = $.fancybox;
+
+	//Add helper object
+	F.helpers.buttons = {
+		tpl: '<div id="fancybox-buttons"><ul><li><a class="btnPrev" title="Previous" href="javascript:;"></a></li><li><a class="btnPlay" title="Start slideshow" href="javascript:;"></a></li><li><a class="btnNext" title="Next" href="javascript:;"></a></li><li><a class="btnToggle" title="Toggle size" href="javascript:;"></a></li><li><a class="btnClose" title="Close" href="javascript:jQuery.fancybox.close();"></a></li></ul></div>',
+		list: null,
+		buttons: {},
+
+		update: function () {
+			var toggle = this.buttons.toggle.removeClass('btnDisabled btnToggleOn');
+
+			//Size toggle button
+			if (F.current.canShrink) {
+				toggle.addClass('btnToggleOn');
+
+			} else if (!F.current.canExpand) {
+				toggle.addClass('btnDisabled');
+			}
+		},
+
+		beforeLoad: function (opts) {
+			//Remove self if gallery do not have at least two items
+			if (F.group.length < 2) {
+				F.coming.helpers.buttons = false;
+				F.coming.closeBtn = true;
+
+				return;
+			}
+
+			//Increase top margin to give space for buttons
+			F.coming.margin[ opts.position === 'bottom' ? 2 : 0 ] += 30;
+		},
+
+		onPlayStart: function () {
+			if (this.list) {
+				this.buttons.play.attr('title', 'Pause slideshow').addClass('btnPlayOn');
+			}
+		},
+
+		onPlayEnd: function () {
+			if (this.list) {
+				this.buttons.play.attr('title', 'Start slideshow').removeClass('btnPlayOn');
+			}
+		},
+
+		afterShow: function (opts) {
+			var buttons;
+
+			if (!this.list) {
+				this.list = $(opts.tpl || this.tpl).addClass(opts.position || 'top').appendTo('body');
+
+				this.buttons = {
+					prev : this.list.find('.btnPrev').click( F.prev ),
+					next : this.list.find('.btnNext').click( F.next ),
+					play : this.list.find('.btnPlay').click( F.play ),
+					toggle : this.list.find('.btnToggle').click( F.toggle )
+				}
+			}
+
+			buttons = this.buttons;
+
+			//Prev
+			if (F.current.index > 0 || F.current.loop) {
+				buttons.prev.removeClass('btnDisabled');
+			} else {
+				buttons.prev.addClass('btnDisabled');
+			}
+
+			//Next / Play
+			if (F.current.loop || F.current.index < F.group.length - 1) {
+				buttons.next.removeClass('btnDisabled');
+				buttons.play.removeClass('btnDisabled');
+
+			} else {
+				buttons.next.addClass('btnDisabled');
+				buttons.play.addClass('btnDisabled');
+			}
+
+			this.update();
+		},
+
+		onUpdate: function () {
+			this.update();
+		},
+
+		beforeClose: function () {
+			if (this.list) {
+				this.list.remove();
+			}
+
+			this.list = null;
+			this.buttons = {};
+		}
+	};
+
+}(jQuery));
\ No newline at end of file

=== added file 'media/fancybox/helpers/jquery.fancybox-media.js'
--- media/fancybox/helpers/jquery.fancybox-media.js	1970-01-01 00:00:00 +0000
+++ media/fancybox/helpers/jquery.fancybox-media.js	2012-07-11 17:31:35 +0000
@@ -0,0 +1,85 @@
+ /*!
+ * Media helper for fancyBox
+ * version: 1.0.0
+ * @requires fancyBox v2.0 or later
+ *
+ * Usage:
+ *     $(".fancybox").fancybox({
+ *         media: {}
+ *     });
+ *
+ *  Supports:
+ *      Youtube
+ *          http://www.youtube.com/watch?v=opj24KnzrWo
+ *          http://youtu.be/opj24KnzrWo
+ *      Vimeo
+ *          http://vimeo.com/25634903
+ *      Metacafe
+ *          http://www.metacafe.com/watch/7635964/dr_seuss_the_lorax_movie_trailer/
+ *          http://www.metacafe.com/watch/7635964/
+ *      Dailymotion
+ *          http://www.dailymotion.com/video/xoytqh_dr-seuss-the-lorax-premiere_people
+ *      Twitvid
+ *          http://twitvid.com/QY7MD
+ *      Twitpic
+ *          http://twitpic.com/7p93st
+ *      Instagram
+ *          http://instagr.am/p/IejkuUGxQn/
+ *          http://instagram.com/p/IejkuUGxQn/
+ *      Google maps
+ *          http://maps.google.com/maps?q=Eiffel+Tower,+Avenue+Gustave+Eiffel,+Paris,+France&t=h&z=17
+ *          http://maps.google.com/?ll=48.857995,2.294297&spn=0.007666,0.021136&t=m&z=16
+ *          http://maps.google.com/?ll=48.859463,2.292626&spn=0.000965,0.002642&t=m&z=19&layer=c&cbll=48.859524,2.292532&panoid=YJ0lq28OOy3VT2IqIuVY0g&cbp=12,151.58,,0,-15.56
+ */
+(function ($) {
+	//Shortcut for fancyBox object
+	var F = $.fancybox;
+
+	//Add helper object
+	F.helpers.media = {
+		beforeLoad : function(opts, obj) {
+			var href = obj.href || '',
+				type = false,
+				rez;
+
+			if ((rez = href.match(/(youtube\.com|youtu\.be)\/(v\/|u\/|embed\/|watch\?v=)?([^#\&\?]*).*/i))) {
+				href = '//www.youtube.com/embed/' + rez[3] + '?autoplay=1&autohide=1&fs=1&rel=0&enablejsapi=1';
+				type = 'iframe';
+
+			} else if ((rez = href.match(/vimeo.com\/(\d+)\/?(.*)/))) {
+				href = '//player.vimeo.com/video/' + rez[1] + '?hd=1&autoplay=1&show_title=1&show_byline=1&show_portrait=0&color=&fullscreen=1';
+				type = 'iframe';
+
+			} else if ((rez = href.match(/metacafe.com\/watch\/(\d+)\/?(.*)/))) {
+				href = '//www.metacafe.com/fplayer/' + rez[1] + '/.swf?playerVars=autoPlay=yes';
+				type = 'swf';
+
+			} else if ((rez = href.match(/dailymotion.com\/video\/(.*)\/?(.*)/))) {
+				href = '//www.dailymotion.com/swf/video/' + rez[1] + '?additionalInfos=0&autoStart=1';
+				type = 'swf';
+
+			} else if ((rez = href.match(/twitvid\.com\/([a-zA-Z0-9_\-\?\=]+)/i))) {
+				href = '//www.twitvid.com/embed.php?autoplay=0&guid=' + rez[1];
+				type = 'iframe';
+
+			} else if ((rez = href.match(/twitpic\.com\/(?!(?:place|photos|events)\/)([a-zA-Z0-9\?\=\-]+)/i))) {
+				href = '//twitpic.com/show/full/' + rez[1];
+				type = 'image';
+
+			} else if ((rez = href.match(/(instagr\.am|instagram\.com)\/p\/([a-zA-Z0-9_\-]+)\/?/i))) {
+				href = '//' + rez[1] + '/p/' + rez[2] + '/media/?size=l';
+				type = 'image';
+
+			} else if ((rez = href.match(/maps\.google\.com\/(\?ll=|maps\/?\?q=)(.*)/i))) {
+				href = '//maps.google.com/' + rez[1] + '' + rez[2] + '&output=' + (rez[2].indexOf('layer=c') ? 'svembed' : 'embed');
+				type = 'iframe';
+			}
+
+			if (type) {
+				obj.href = href;
+				obj.type = type;
+			}
+		}
+	}
+
+}(jQuery));
\ No newline at end of file

=== added file 'media/fancybox/helpers/jquery.fancybox-thumbs.css'
--- media/fancybox/helpers/jquery.fancybox-thumbs.css	1970-01-01 00:00:00 +0000
+++ media/fancybox/helpers/jquery.fancybox-thumbs.css	2012-07-11 17:31:35 +0000
@@ -0,0 +1,54 @@
+#fancybox-thumbs {
+	position: fixed;
+	left: 0;
+	width: 100%;
+	overflow: hidden;
+	z-index: 8050;
+}
+
+#fancybox-thumbs.bottom {
+	bottom: 2px;
+}
+
+#fancybox-thumbs.top {
+	top: 2px;
+}
+
+#fancybox-thumbs ul {
+	position: relative;
+	list-style: none;
+	margin: 0;
+	padding: 0;
+}
+
+#fancybox-thumbs ul li {
+	float: left;
+	padding: 1px;
+	opacity: 0.5;
+}
+
+#fancybox-thumbs ul li.active {
+	opacity: 0.75;
+	padding: 0;
+	border: 1px solid #fff;
+}
+
+#fancybox-thumbs ul li:hover {
+	opacity: 1;
+}
+
+#fancybox-thumbs ul li a {
+	display: block;
+	position: relative;
+	overflow: hidden;
+	border: 1px solid #222;
+	background: #111;
+	outline: none;
+}
+
+#fancybox-thumbs ul li img {
+	display: block;
+	position: relative;
+	border: 0;
+	padding: 0;
+}
\ No newline at end of file

=== added file 'media/fancybox/helpers/jquery.fancybox-thumbs.js'
--- media/fancybox/helpers/jquery.fancybox-thumbs.js	1970-01-01 00:00:00 +0000
+++ media/fancybox/helpers/jquery.fancybox-thumbs.js	2012-07-11 17:31:35 +0000
@@ -0,0 +1,157 @@
+ /*!
+ * Thumbnail helper for fancyBox
+ * version: 1.0.4
+ * @requires fancyBox v2.0 or later
+ *
+ * Usage:
+ *     $(".fancybox").fancybox({
+ *         thumbs: {
+ *             width  : 50,
+ *             height : 50
+ *         }
+ *     });
+ *
+ * Options:
+ *     width - thumbnail width
+ *     height - thumbnail height
+ *     source - function to obtain the URL of the thumbnail image
+ *     position - 'top' or 'bottom'
+ *
+ */
+(function ($) {
+	//Shortcut for fancyBox object
+	var F = $.fancybox;
+
+	//Add helper object
+	F.helpers.thumbs = {
+		wrap: null,
+		list: null,
+		width: 0,
+
+		//Default function to obtain the URL of the thumbnail image
+		source: function (el) {
+			var img;
+
+			if ($.type(el) === 'string') {
+				return el;
+			}
+
+			img = $(el).find('img');
+
+			return img.length ? img.attr('src') : el.href;
+		},
+
+		init: function (opts) {
+			var that = this,
+				list,
+				thumbWidth = opts.width || 50,
+				thumbHeight = opts.height || 50,
+				thumbSource = opts.source || this.source;
+
+			//Build list structure
+			list = '';
+
+			for (var n = 0; n < F.group.length; n++) {
+				list += '<li><a style="width:' + thumbWidth + 'px;height:' + thumbHeight + 'px;" href="javascript:jQuery.fancybox.jumpto(' + n + ');"></a></li>';
+			}
+
+			this.wrap = $('<div id="fancybox-thumbs"></div>').addClass(opts.position || 'bottom').appendTo('body');
+			this.list = $('<ul>' + list + '</ul>').appendTo(this.wrap);
+
+			//Load each thumbnail
+			$.each(F.group, function (i) {
+				$("<img />").load(function () {
+					var width = this.width,
+						height = this.height,
+						widthRatio, heightRatio, parent;
+
+					if (!that.list || !width || !height) {
+						return;
+					}
+
+					//Calculate thumbnail width/height and center it
+					widthRatio = width / thumbWidth;
+					heightRatio = height / thumbHeight;
+					parent = that.list.children().eq(i).find('a');
+
+					if (widthRatio >= 1 && heightRatio >= 1) {
+						if (widthRatio > heightRatio) {
+							width = Math.floor(width / heightRatio);
+							height = thumbHeight;
+
+						} else {
+							width = thumbWidth;
+							height = Math.floor(height / widthRatio);
+						}
+					}
+
+					$(this).css({
+						width: width,
+						height: height,
+						top: Math.floor(thumbHeight / 2 - height / 2),
+						left: Math.floor(thumbWidth / 2 - width / 2)
+					});
+
+					parent.width(thumbWidth).height(thumbHeight);
+
+					$(this).hide().appendTo(parent).fadeIn(300);
+
+				}).attr('src', thumbSource( F.group[ i ] ));
+			});
+
+			//Set initial width
+			this.width = this.list.children().eq(0).outerWidth(true);
+
+			this.list.width(this.width * (F.group.length + 1)).css('left', Math.floor($(window).width() * 0.5 - (F.current.index * this.width + this.width * 0.5)));
+		},
+
+		//Center list
+		update: function (opts) {
+			if (this.list) {
+				this.list.stop(true).animate({
+					'left': Math.floor($(window).width() * 0.5 - (F.current.index * this.width + this.width * 0.5))
+				}, 150);
+			}
+		},
+
+		beforeLoad: function (opts) {
+			//Remove self if gallery do not have at least two items
+			if (F.group.length < 2) {
+				F.coming.helpers.thumbs = false;
+
+				return;
+			}
+
+			//Increase bottom margin to give space for thumbs
+			F.coming.margin[ opts.position === 'top' ? 0 : 2 ] = opts.height + 30;
+		},
+
+		afterShow: function (opts) {
+			//Check if exists and create or update list
+			if (this.list) {
+				this.update(opts);
+
+			} else {
+				this.init(opts);
+			}
+
+			//Set active element
+			this.list.children().removeClass('active').eq(F.current.index).addClass('active');
+		},
+
+		onUpdate: function () {
+			this.update();
+		},
+
+		beforeClose: function () {
+			if (this.wrap) {
+				this.wrap.remove();
+			}
+
+			this.wrap = null;
+			this.list = null;
+			this.width = 0;
+		}
+	}
+
+}(jQuery));
\ No newline at end of file

=== added file 'media/fancybox/jquery.fancybox.css'
--- media/fancybox/jquery.fancybox.css	1970-01-01 00:00:00 +0000
+++ media/fancybox/jquery.fancybox.css	2012-07-11 17:31:35 +0000
@@ -0,0 +1,234 @@
+/*! fancyBox v2.0.6 fancyapps.com | fancyapps.com/fancybox/#license */
+.fancybox-tmp iframe, .fancybox-tmp object {
+	vertical-align: top;
+	padding: 0;
+	margin: 0;
+}
+
+.fancybox-wrap {
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 8020;
+}
+
+.fancybox-skin {
+	position: relative;
+	padding: 0;
+	margin: 0;
+	background: #f9f9f9;
+	color: #444;
+	text-shadow: none;
+	-webkit-border-radius: 4px;
+	   -moz-border-radius: 4px;
+	        border-radius: 4px;
+}
+
+.fancybox-opened {
+	z-index: 8030;
+}
+
+.fancybox-opened .fancybox-skin {
+	-webkit-box-shadow: 0 10px 25px rgba(0, 0, 0, 0.5);
+	   -moz-box-shadow: 0 10px 25px rgba(0, 0, 0, 0.5);
+	        box-shadow: 0 10px 25px rgba(0, 0, 0, 0.5);
+}
+
+.fancybox-outer, .fancybox-inner {
+	padding: 0;
+	margin: 0;
+	position: relative;
+	outline: none;
+}
+
+.fancybox-inner {
+	overflow: hidden;
+}
+
+.fancybox-type-iframe .fancybox-inner {
+	-webkit-overflow-scrolling: touch;
+}
+
+.fancybox-error {
+	color: #444;
+	font: 14px/20px "Helvetica Neue",Helvetica,Arial,sans-serif;
+	margin: 0;
+	padding: 10px;
+}
+
+.fancybox-image, .fancybox-iframe {
+	display: block;
+	width: 100%;
+	height: 100%;
+	border: 0;
+	padding: 0;
+	margin: 0;
+	vertical-align: top;
+}
+
+.fancybox-image {
+	max-width: 100%;
+	max-height: 100%;
+}
+
+#fancybox-loading, .fancybox-close, .fancybox-prev span, .fancybox-next span {
+	background-image: url('fancybox_sprite.png');
+}
+
+#fancybox-loading {
+	position: fixed;
+	top: 50%;
+	left: 50%;
+	margin-top: -22px;
+	margin-left: -22px;
+	background-position: 0 -108px;
+	opacity: 0.8;
+	cursor: pointer;
+	z-index: 8020;
+}
+
+#fancybox-loading div {
+	width: 44px;
+	height: 44px;
+	background: url('fancybox_loading.gif') center center no-repeat;
+}
+
+.fancybox-close {
+	position: absolute;
+	top: -18px;
+	right: -18px;
+	width: 36px;
+	height: 36px;
+	cursor: pointer;
+	z-index: 8040;
+}
+
+.fancybox-nav {
+	position: absolute;
+	top: 0;
+	width: 40%;
+	height: 100%;
+	cursor: pointer;
+	background: transparent url('blank.gif'); /* helps IE */
+	-webkit-tap-highlight-color: rgba(0,0,0,0);
+	z-index: 8040;
+}
+
+.fancybox-prev {
+	left: 0;
+}
+
+.fancybox-next {
+	right: 0;
+}
+
+.fancybox-nav span {
+	position: absolute;
+	top: 50%;
+	width: 36px;
+	height: 34px;
+	margin-top: -18px;
+	cursor: pointer;
+	z-index: 8040;
+	visibility: hidden;
+}
+
+.fancybox-prev span {
+	left: 20px;
+	background-position: 0 -36px;
+}
+
+.fancybox-next span {
+	right: 20px;
+	background-position: 0 -72px;
+}
+
+.fancybox-nav:hover span {
+	visibility: visible;
+}
+
+.fancybox-tmp {
+	position: absolute;
+	top: -9999px;
+	left: -9999px;
+	padding: 0;
+	overflow: visible;
+	visibility: hidden;
+}
+
+/* Overlay helper */
+
+#fancybox-overlay {
+	position: absolute;
+	top: 0;
+	left: 0;
+	overflow: hidden;
+	display: none;
+	z-index: 8010;
+	background: #000;
+}
+
+#fancybox-overlay.overlay-fixed {
+	position: fixed;
+	bottom: 0;
+	right: 0;
+}
+
+/* Title helper */
+
+.fancybox-title {
+	visibility: hidden;
+	font: normal 13px/20px "Helvetica Neue",Helvetica,Arial,sans-serif;
+	position: relative;
+	text-shadow: none;
+	z-index: 8050;
+}
+
+.fancybox-opened .fancybox-title {
+	visibility: visible;
+}
+
+.fancybox-title-float-wrap {
+	position: absolute;
+	bottom: 0;
+	right: 50%;
+	margin-bottom: -35px;
+	z-index: 8030;
+	text-align: center;
+}
+
+.fancybox-title-float-wrap .child {
+	display: inline-block;
+	margin-right: -100%;
+	padding: 2px 20px;
+	background: transparent; /* Fallback for web browsers that doesn't support RGBa */
+	background: rgba(0, 0, 0, 0.8);
+	-webkit-border-radius: 15px;
+	   -moz-border-radius: 15px;
+	        border-radius: 15px;
+	text-shadow: 0 1px 2px #222;
+	color: #FFF;
+	font-weight: bold;
+	line-height: 24px;
+	white-space: nowrap;
+}
+
+.fancybox-title-outside-wrap {
+	position: relative;
+	margin-top: 10px;
+	color: #fff;
+}
+
+.fancybox-title-inside-wrap {
+	margin-top: 10px;
+}
+
+.fancybox-title-over-wrap {
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	color: #fff;
+	padding: 10px;
+	background: #000;
+	background: rgba(0, 0, 0, .8);
+}
\ No newline at end of file

=== added file 'media/fancybox/jquery.fancybox.js'
--- media/fancybox/jquery.fancybox.js	1970-01-01 00:00:00 +0000
+++ media/fancybox/jquery.fancybox.js	2012-07-11 17:31:35 +0000
@@ -0,0 +1,1463 @@
+/*!
+ * fancyBox - jQuery Plugin
+ * version: 2.0.6 (16/04/2012)
+ * @requires jQuery v1.6 or later
+ *
+ * Examples at http://fancyapps.com/fancybox/
+ * License: www.fancyapps.com/fancybox/#license
+ *
+ * Copyright 2012 Janis Skarnelis - [e-mail]
+ *
+ */
+
+(function (window, document, $, undefined) {
+	"use strict";
+
+	var W = $(window),
+		D = $(document),
+		F = $.fancybox = function () {
+			F.open.apply( this, arguments );
+		},
+		didResize	= false,
+		resizeTimer	= null,
+		isTouch		= document.createTouch !== undefined,
+		isString	= function(str) {
+			return $.type(str) === "string";
+		},
+		isPercentage = function(str) {
+			return isString(str) && str.indexOf('%') > 0;
+		},
+		getValue = function(value, dim) {
+			if (dim && isPercentage(value)) {
+				value = F.getViewport()[ dim ] / 100 * parseInt(value, 10);
+			}
+
+			return Math.round(value) + 'px';
+		};
+
+	$.extend(F, {
+		// The current version of fancyBox
+		version: '2.0.5',
+
+		defaults: {
+			padding: 15,
+			margin: 20,
+
+			width: 800,
+			height: 600,
+			minWidth: 100,
+			minHeight: 100,
+			maxWidth: 9999,
+			maxHeight: 9999,
+
+			autoSize: true,
+			autoResize: !isTouch,
+			autoCenter : !isTouch,
+			fitToView: true,
+			aspectRatio: false,
+			topRatio: 0.5,
+
+			fixed: false,
+			scrolling: 'auto', // 'auto', 'yes' or 'no'
+			wrapCSS: '',
+
+			arrows: true,
+			closeBtn: true,
+			closeClick: false,
+			nextClick : false,
+			mouseWheel: true,
+			autoPlay: false,
+			playSpeed: 3000,
+			preload : 3,
+
+			modal: false,
+			loop: true,
+			ajax: { dataType: 'html', headers: { 'X-fancyBox': true } },
+			keys: {
+				next: [13, 32, 34, 39, 40], // enter, space, page down, right arrow, down arrow
+				prev: [8, 33, 37, 38], // backspace, page up, left arrow, up arrow
+				close: [27] // escape key
+			},
+
+			// Override some properties
+			index: 0,
+			type: null,
+			href: null,
+			content: null,
+			title: null,
+
+			// HTML templates
+			tpl: {
+				wrap: '<div class="fancybox-wrap"><div class="fancybox-skin"><div class="fancybox-outer"><div class="fancybox-inner"></div></div></div></div>',
+				image: '<img class="fancybox-image" src="{href}" alt="" />',
+				iframe: '<iframe class="fancybox-iframe" name="fancybox-frame{rnd}" frameborder="0" hspace="0"' + ($.browser.msie ? ' allowtransparency="true"' : '') + '></iframe>',
+				swf: '<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="100%" height="100%"><param name="wmode" value="transparent" /><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="movie" value="{href}" /><embed src="{href}" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="100%" height="100%" wmode="transparent"></embed></object>',
+				error: '<p class="fancybox-error">The requested content cannot be loaded.<br/>Please try again later.</p>',
+				closeBtn: '<div title="Close" class="fancybox-item fancybox-close"></div>',
+				next: '<a title="Next" class="fancybox-nav fancybox-next"><span></span></a>',
+				prev: '<a title="Previous" class="fancybox-nav fancybox-prev"><span></span></a>'
+			},
+
+			// Properties for each animation type
+			// Opening fancyBox
+			openEffect: 'fade', // 'elastic', 'fade' or 'none'
+			openSpeed: 300,
+			openEasing: 'swing',
+			openOpacity: true,
+			openMethod: 'zoomIn',
+
+			// Closing fancyBox
+			closeEffect: 'fade', // 'elastic', 'fade' or 'none'
+			closeSpeed: 300,
+			closeEasing: 'swing',
+			closeOpacity: true,
+			closeMethod: 'zoomOut',
+
+			// Changing next gallery item
+			nextEffect: 'elastic', // 'elastic', 'fade' or 'none'
+			nextSpeed: 300,
+			nextEasing: 'swing',
+			nextMethod: 'changeIn',
+
+			// Changing previous gallery item
+			prevEffect: 'elastic', // 'elastic', 'fade' or 'none'
+			prevSpeed: 300,
+			prevEasing: 'swing',
+			prevMethod: 'changeOut',
+
+			// Enabled helpers
+			helpers: {
+				overlay: {
+					speedIn: 0,
+					speedOut: 300,
+					opacity: 0.8,
+					css: {
+						cursor: 'pointer'
+					},
+					closeClick: true
+				},
+				title: {
+					type: 'float' // 'float', 'inside', 'outside' or 'over'
+				}
+			},
+
+			// Callbacks
+			onCancel: $.noop, // If canceling
+			beforeLoad: $.noop, // Before loading
+			afterLoad: $.noop, // After loading
+			beforeShow: $.noop, // Before changing in current item
+			afterShow: $.noop, // After opening
+			beforeClose: $.noop, // Before closing
+			afterClose: $.noop // After closing
+		},
+
+		//Current state
+		group: {}, // Selected group
+		opts: {}, // Group options
+		coming: null, // Element being loaded
+		current: null, // Currently loaded element
+		isOpen: false, // Is currently open
+		isOpened: false, // Have been fully opened at least once
+		wrap: null,
+		skin: null,
+		outer: null,
+		inner: null,
+
+		player: {
+			timer: null,
+			isActive: false
+		},
+
+		// Loaders
+		ajaxLoad: null,
+		imgPreload: null,
+
+		// Some collections
+		transitions: {},
+		helpers: {},
+
+		/*
+		 *	Static methods
+		 */
+
+		open: function (group, opts) {
+			//Kill existing instances
+			F.close(true);
+
+			//Normalize group
+			if (group && !$.isArray(group)) {
+				group = group instanceof $ ? $(group).get() : [group];
+			}
+
+			F.isActive = true;
+
+			//Extend the defaults
+			F.opts = $.extend(true, {}, F.defaults, opts);
+
+			//All options are merged recursive except keys
+			if ($.isPlainObject(opts) && opts.keys !== undefined) {
+				F.opts.keys = opts.keys ? $.extend({}, F.defaults.keys, opts.keys) : false;
+			}
+
+			F.group = group;
+
+			F._start(F.opts.index || 0);
+		},
+
+		cancel: function () {
+			if (F.coming && false === F.trigger('onCancel')) {
+				return;
+			}
+
+			F.coming = null;
+
+			F.hideLoading();
+
+			if (F.ajaxLoad) {
+				F.ajaxLoad.abort();
+			}
+
+			F.ajaxLoad = null;
+
+			if (F.imgPreload) {
+				F.imgPreload.onload = F.imgPreload.onabort = F.imgPreload.onerror = null;
+			}
+		},
+
+		close: function (a) {
+			F.cancel();
+
+			if (!F.current || false === F.trigger('beforeClose')) {
+				return;
+			}
+
+			F.unbindEvents();
+
+			//If forced or is still opening then remove immediately
+			if (!F.isOpen || (a && a[0] === true)) {
+				$('.fancybox-wrap').stop().trigger('onReset').remove();
+
+				F._afterZoomOut();
+
+			} else {
+				F.isOpen = F.isOpened = false;
+
+				$('.fancybox-item, .fancybox-nav').remove();
+
+				F.wrap.stop(true).removeClass('fancybox-opened');
+				F.inner.css('overflow', 'hidden');
+
+				F.transitions[F.current.closeMethod]();
+			}
+		},
+
+		// Start/stop slideshow
+		play: function (a) {
+			var clear = function () {
+					clearTimeout(F.player.timer);
+				},
+				set = function () {
+					clear();
+
+					if (F.current && F.player.isActive) {
+						F.player.timer = setTimeout(F.next, F.current.playSpeed);
+					}
+				},
+				stop = function () {
+					clear();
+
+					$('body').unbind('.player');
+
+					F.player.isActive = false;
+
+					F.trigger('onPlayEnd');
+				},
+				start = function () {
+					if (F.current && (F.current.loop || F.current.index < F.group.length - 1)) {
+						F.player.isActive = true;
+
+						$('body').bind({
+							'afterShow.player onUpdate.player': set,
+							'onCancel.player beforeClose.player': stop,
+							'beforeLoad.player': clear
+						});
+
+						set();
+
+						F.trigger('onPlayStart');
+					}
+				};
+
+			if (F.player.isActive || (a && a[0] === false)) {
+				stop();
+			} else {
+				start();
+			}
+		},
+
+		next: function () {
+			if (F.current) {
+				F.jumpto(F.current.index + 1);
+			}
+		},
+
+		prev: function () {
+			if (F.current) {
+				F.jumpto(F.current.index - 1);
+			}
+		},
+
+		jumpto: function (index) {
+			if (!F.current) {
+				return;
+			}
+
+			index = parseInt(index, 10);
+
+			if (F.group.length > 1 && F.current.loop) {
+				if (index >= F.group.length) {
+					index = 0;
+
+				} else if (index < 0) {
+					index = F.group.length - 1;
+				}
+			}
+
+			if (F.group[index] !== undefined) {
+				F.cancel();
+
+				F._start(index);
+			}
+		},
+
+		reposition: function (e, onlyAbsolute) {
+			var pos;
+
+			if (F.isOpen) {
+				pos = F._getPosition(onlyAbsolute);
+
+				if (e && e.type === 'scroll') {
+					delete pos.position;
+
+					F.wrap.stop(true, true).animate(pos, 200);
+
+				} else {
+					F.wrap.css(pos);
+				}
+			}
+		},
+
+		update: function (e) {
+			if (!F.isOpen) {
+				return;
+			}
+
+			// Run this code after a delay for better performance
+			if (!didResize) {
+				resizeTimer = setTimeout(function () {
+					var current = F.current, anyway = !e || (e && e.type === 'orientationchange');
+
+					if (didResize) {
+						didResize = false;
+
+						if (!current) {
+							return;
+						}
+
+						if ((!e || e.type !== 'scroll') || anyway) {
+							if (current.autoSize && current.type !== 'iframe') {
+								F.inner.height('auto');
+								current.height = F.inner.height();
+							}
+
+							if (current.autoResize || anyway) {
+								F._setDimension();
+							}
+
+							if (current.canGrow && current.type !== 'iframe') {
+								F.inner.height('auto');
+							}
+						}
+
+						if (current.autoCenter || anyway) {
+							F.reposition(e);
+						}
+
+						F.trigger('onUpdate');
+					}
+				}, 200);
+			}
+
+			didResize = true;
+		},
+
+		toggle: function () {
+			if (F.isOpen) {
+				F.current.fitToView = !F.current.fitToView;
+
+				F.update();
+			}
+		},
+
+		hideLoading: function () {
+			D.unbind('keypress.fb');
+
+			$('#fancybox-loading').remove();
+		},
+
+		showLoading: function () {
+			F.hideLoading();
+
+			//If user will press the escape-button, the request will be canceled
+			D.bind('keypress.fb', function(e) {
+				if (e.keyCode === 27) {
+					e.preventDefault();
+					F.cancel();
+				}
+			});
+
+			$('<div id="fancybox-loading"><div></div></div>').click(F.cancel).appendTo('body');
+		},
+
+		getViewport: function () {
+			// See http://bugs.jquery.com/ticket/6724
+			return {
+				x: W.scrollLeft(),
+				y: W.scrollTop(),
+				w: isTouch && window.innerWidth ? window.innerWidth : W.width(),
+				h: isTouch && window.innerHeight ? window.innerHeight : W.height()
+			};
+		},
+
+		// Unbind the keyboard / clicking actions
+		unbindEvents: function () {
+			if (F.wrap) {
+				F.wrap.unbind('.fb');
+			}
+
+			D.unbind('.fb');
+			W.unbind('.fb');
+		},
+
+		bindEvents: function () {
+			var current = F.current,
+				keys = current.keys;
+
+			if (!current) {
+				return;
+			}
+
+			W.bind('resize.fb orientationchange.fb' + (current.autoCenter && !current.fixed ? ' scroll.fb' : ''), F.update);
+
+			if (keys) {
+				D.bind('keydown.fb', function (e) {
+					var code, target = e.target || e.srcElement;
+
+					// Ignore key combinations and key events within form elements
+					if (!e.ctrlKey && !e.altKey && !e.shiftKey && !e.metaKey && !(target && (target.type || $(target).is('[contenteditable]')))) {
+						code = e.keyCode;
+
+						if ($.inArray(code, keys.close) > -1) {
+							F.close();
+							e.preventDefault();
+
+						} else if ($.inArray(code, keys.next) > -1) {
+							F.next();
+							e.preventDefault();
+
+						} else if ($.inArray(code, keys.prev) > -1) {
+							F.prev();
+							e.preventDefault();
+						}
+					}
+				});
+			}
+
+			if ($.fn.mousewheel && current.mouseWheel && F.group.length > 1) {
+				F.wrap.bind('mousewheel.fb', function (e, delta) {
+					var target = e.target || null;
+
+					if (delta !== 0 && (!target || target.clientHeight === 0 || (target.scrollHeight === target.clientHeight && target.scrollWidth === target.clientWidth))) {
+						e.preventDefault();
+
+						F[delta > 0 ? 'prev' : 'next']();
+					}
+				});
+			}
+		},
+
+		trigger: function (event, o) {
+			var ret, obj = o || F[ $.inArray(event, ['onCancel', 'beforeLoad', 'afterLoad']) > -1 ? 'coming' : 'current' ];
+
+			if (!obj) {
+				return;
+			}
+
+			if ($.isFunction( obj[event] )) {
+				ret = obj[event].apply(obj, Array.prototype.slice.call(arguments, 1));
+			}
+
+			if (ret === false) {
+				return false;
+			}
+
+			if (obj.helpers) {
+				$.each(obj.helpers, function (helper, opts) {
+					if (opts && $.isPlainObject(F.helpers[helper]) && $.isFunction(F.helpers[helper][event])) {
+						F.helpers[helper][event](opts, obj);
+					}
+				});
+			}
+
+			$.event.trigger(event + '.fb');
+		},
+
+		isImage: function (str) {
+			return isString(str) && str.match(/\.(jpe?g|gif|png|bmp)((\?|#).*)?$/i);
+		},
+
+		isSWF: function (str) {
+			return isString(str) && str.match(/\.(swf)((\?|#).*)?$/i);
+		},
+
+		_start: function (index) {
+			var coming = {},
+				element = F.group[index] || null,
+				isDom,
+				href,
+				type,
+				rez,
+				hrefParts;
+
+			if (element && (element.nodeType || element instanceof $)) {
+				isDom = true;
+
+				if ($.metadata) {
+					coming = $(element).metadata();
+				}
+			}
+
+			coming = $.extend(true, {}, F.opts, {index : index, element : element}, ($.isPlainObject(element) ? element : coming));
+
+			// Re-check overridable options
+			$.each(['href', 'title', 'content', 'type'], function(i,v) {
+				coming[v] = F.opts[ v ] || (isDom && $(element).attr( v )) || coming[ v ] || null;
+			});
+
+			// Convert margin property to array - top, right, bottom, left
+			if (typeof coming.margin === 'number') {
+				coming.margin = [coming.margin, coming.margin, coming.margin, coming.margin];
+			}
+
+			// 'modal' propery is just a shortcut
+			if (coming.modal) {
+				$.extend(true, coming, {
+					closeBtn : false,
+					closeClick: false,
+					nextClick : false,
+					arrows : false,
+					mouseWheel : false,
+					keys : null,
+					helpers: {
+						overlay : {
+							css: {
+								cursor : 'auto'
+							},
+							closeClick : false
+						}
+					}
+				});
+			}
+
+			//Give a chance for callback or helpers to update coming item (type, title, etc)
+			F.coming = coming;
+
+			if (false === F.trigger('beforeLoad')) {
+				F.coming = null;
+				return;
+			}
+
+			type = coming.type;
+			href = coming.href || element;
+
+			///Check if content type is set, if not, try to get
+			if (!type) {
+				if (isDom) {
+					type = $(element).data('fancybox-type');
+
+					if (!type) {
+						rez = element.className.match(/fancybox\.(\w+)/);
+						type = rez ? rez[1] : null;
+					}
+				}
+
+				if (!type && isString(href)) {
+					if (F.isImage(href)) {
+						type = 'image';
+
+					} else if (F.isSWF(href)) {
+						type = 'swf';
+
+					} else if (href.match(/^#/)) {
+						type = 'inline';
+					}
+				}
+
+				// ...if not - display element itself
+				if (!type) {
+					type = isDom ? 'inline' : 'html';
+				}
+
+				coming.type = type;
+			}
+
+			// Check before try to load; 'inline' and 'html' types need content, others - href
+			if (type === 'inline' || type === 'html') {
+				if (!coming.content) {
+					if (type === 'inline') {
+						coming.content = $( isString(href) ? href.replace(/.*(?=#[^\s]+$)/, '') : href ); //strip for ie7
+
+					} else {
+						coming.content = element;
+					}
+				}
+
+				if (!coming.content || !coming.content.length) {
+					type = null;
+				}
+
+			} else if (!href) {
+				type = null;
+			}
+
+			/*
+			 * Add reference to the group, so it`s possible to access from callbacks, example:
+			 * afterLoad : function() {
+			 *     this.title = 'Image ' + (this.index + 1) + ' of ' + this.group.length + (this.title ? ' - ' + this.title : '');
+			 * }
+			 */
+
+			if (type === 'ajax' && isString(href)) {
+				hrefParts = href.split(/\s+/, 2);
+
+				href = hrefParts.shift();
+				coming.selector = hrefParts.shift();
+			}
+
+			coming.href  = href;
+			coming.group = F.group;
+			coming.isDom = isDom;
+
+			switch (type) {
+				case 'image':
+					F._loadImage();
+					break;
+
+				case 'ajax':
+					F._loadAjax();
+					break;
+
+				case 'inline':
+				case 'iframe':
+				case 'swf':
+				case 'html':
+					F._afterLoad();
+					break;
+
+				default:
+					F._error( 'type' );
+			}
+		},
+
+		_error: function ( type ) {
+			F.hideLoading();
+
+			$.extend(F.coming, {
+				type      : 'html',
+				autoSize  : true,
+				minWidth  : 0,
+				minHeight : 0,
+				padding   : 15,
+				hasError  : type,
+				content   : F.coming.tpl.error
+			});
+
+			F._afterLoad();
+		},
+
+		_loadImage: function () {
+			// Reset preload image so it is later possible to check "complete" property
+			var img = F.imgPreload = new Image();
+
+			img.onload = function () {
+				this.onload = this.onerror = null;
+
+				F.coming.width  = this.width;
+				F.coming.height = this.height;
+
+				F._afterLoad();
+			};
+
+			img.onerror = function () {
+				this.onload = this.onerror = null;
+
+				F._error( 'image' );
+			};
+
+			img.src = F.coming.href;
+
+			if (img.complete === undefined || !img.complete) {
+				F.showLoading();
+			}
+		},
+
+		_loadAjax: function () {
+			F.showLoading();
+
+			F.ajaxLoad = $.ajax($.extend({}, F.coming.ajax, {
+				url: F.coming.href,
+				error: function (jqXHR, textStatus) {
+					if (F.coming && textStatus !== 'abort') {
+						F._error( 'ajax', jqXHR );
+
+					} else {
+						F.hideLoading();
+					}
+				},
+				success: function (data, textStatus) {
+					if (textStatus === 'success') {
+						F.coming.content = data;
+
+						F._afterLoad();
+					}
+				}
+			}));
+		},
+
+		_preloadImages: function() {
+			var group = F.group,
+				current = F.current,
+				len = group.length,
+				item,
+				href,
+				i,
+				cnt = Math.min(current.preload, len - 1);
+
+			if (!current.preload || group.length < 2) {
+				return;
+			}
+
+			for (i = 1; i <= cnt; i += 1) {
+				item = group[ (current.index + i ) % len ];
+				href = item.href || $( item ).attr('href') || item;
+
+				if (item.type === 'image' || F.isImage(href)) {
+					new Image().src = href;
+				}
+			}
+		},
+
+		_afterLoad: function () {
+			F.hideLoading();
+
+			if (!F.coming || false === F.trigger('afterLoad', F.current)) {
+				F.coming = false;
+
+				return;
+			}
+
+			if (F.isOpened) {
+				$('.fancybox-item, .fancybox-nav').remove();
+
+				F.wrap.stop(true).removeClass('fancybox-opened');
+				F.inner.css('overflow', 'hidden');
+
+				F.transitions[F.current.prevMethod]();
+
+			} else {
+				$('.fancybox-wrap').stop().trigger('onReset').remove();
+
+				F.trigger('afterClose');
+			}
+
+			F.unbindEvents();
+
+			F.isOpen    = false;
+			F.current   = F.coming;
+
+			//Build the neccessary markup
+			F.wrap  = $(F.current.tpl.wrap).addClass('fancybox-' + (isTouch ? 'mobile' : 'desktop') + ' fancybox-type-' + F.current.type + ' fancybox-tmp ' + F.current.wrapCSS).appendTo('body');
+			F.skin  = $('.fancybox-skin', F.wrap).css('padding', getValue(F.current.padding));
+			F.outer = $('.fancybox-outer', F.wrap);
+			F.inner = $('.fancybox-inner', F.wrap);
+
+			F._setContent();
+		},
+
+		_setContent: function () {
+			var current = F.current,
+				content = current.content,
+				type    = current.type,
+				minWidth    = current.minWidth,
+				minHeight   = current.minHeight,
+				maxWidth    = current.maxWidth,
+				maxHeight   = current.maxHeight,
+				loadingBay;
+
+			switch (type) {
+				case 'inline':
+				case 'ajax':
+				case 'html':
+					if (current.selector) {
+						content = $('<div>').html(content).find(current.selector);
+
+					} else if (content instanceof $) {
+						if (content.parent().hasClass('fancybox-inner')) {
+							content.parents('.fancybox-wrap').unbind('onReset');
+						}
+
+						content = content.show().detach();
+
+						$(F.wrap).bind('onReset', function () {
+							content.appendTo('body').hide();
+						});
+					}
+
+					if (current.autoSize) {
+						loadingBay = $('<div class="fancybox-wrap ' + F.current.wrapCSS + ' fancybox-tmp"></div>')
+							.appendTo('body')
+							.css({
+								minWidth    : getValue(minWidth, 'w'),
+								minHeight   : getValue(minHeight, 'h'),
+								maxWidth    : getValue(maxWidth, 'w'),
+								maxHeight   : getValue(maxHeight, 'h')
+							})
+							.append(content);
+
+						current.width = loadingBay.width();
+						current.height = loadingBay.height();
+
+						// Re-check to fix 1px bug in some browsers
+						loadingBay.width( F.current.width );
+
+						if (loadingBay.height() > current.height) {
+							loadingBay.width(current.width + 1);
+
+							current.width = loadingBay.width();
+							current.height = loadingBay.height();
+						}
+
+						content = loadingBay.contents().detach();
+
+						loadingBay.remove();
+					}
+
+					break;
+
+				case 'image':
+					content = current.tpl.image.replace('{href}', current.href);
+
+					current.aspectRatio = true;
+					break;
+
+				case 'swf':
+					content = current.tpl.swf.replace(/\{width\}/g, current.width).replace(/\{height\}/g, current.height).replace(/\{href\}/g, current.href);
+					break;
+
+				case 'iframe':
+					content = $(current.tpl.iframe.replace('{rnd}', new Date().getTime()) )
+						.attr('scrolling', current.scrolling)
+						.attr('src', current.href);
+
+					current.scrolling = isTouch ? 'scroll' : 'auto';
+
+					break;
+			}
+
+			if (type === 'image' || type === 'swf') {
+				current.autoSize = false;
+				current.scrolling = 'visible';
+			}
+
+			if (type === 'iframe' && current.autoSize) {
+				F.showLoading();
+
+				F._setDimension();
+
+				F.inner.css('overflow', current.scrolling);
+
+				content.bind({
+					onCancel : function() {
+						$(this).unbind();
+
+						F._afterZoomOut();
+					},
+					load : function() {
+						F.hideLoading();
+
+						try {
+							if (this.contentWindow.document.location) {
+								F.current.height = $(this).contents().find('body').height();
+							}
+						} catch (e) {
+							F.current.autoSize = false;
+						}
+
+						F[ F.isOpen ? '_afterZoomIn' : '_beforeShow']();
+					}
+				}).appendTo(F.inner);
+
+			} else {
+				F.inner.append(content);
+
+				F._beforeShow();
+			}
+		},
+
+		_beforeShow : function() {
+			F.coming = null;
+
+			//Give a chance for helpers or callbacks to update elements
+			F.trigger('beforeShow');
+
+			//Set initial dimensions and hide
+			F._setDimension();
+			F.wrap.hide().removeClass('fancybox-tmp');
+
+			F.bindEvents();
+
+			F._preloadImages();
+
+			F.transitions[ F.isOpened ? F.current.nextMethod : F.current.openMethod ]();
+		},
+
+		_setDimension: function () {
+			var wrap      = F.wrap,
+				inner     = F.inner,
+				current   = F.current,
+				viewport  = F.getViewport(),
+				margin    = current.margin,
+				padding2  = current.padding * 2,
+				width     = current.width,
+				height    = current.height,
+				maxWidth  = current.maxWidth + padding2,
+				maxHeight = current.maxHeight + padding2,
+				minWidth  = current.minWidth + padding2,
+				minHeight = current.minHeight + padding2,
+				ratio,
+				height_;
+
+			viewport.w -= (margin[1] + margin[3]);
+			viewport.h -= (margin[0] + margin[2]);
+
+			if (isPercentage(width)) {
+				width = (((viewport.w - padding2) * parseFloat(width)) / 100);
+			}
+
+			if (isPercentage(height)) {
+				height = (((viewport.h - padding2) * parseFloat(height)) / 100);
+			}
+
+			ratio  = width / height;
+			width  += padding2;
+			height += padding2;
+
+			if (current.fitToView) {
+				maxWidth  = Math.min(viewport.w, maxWidth);
+				maxHeight = Math.min(viewport.h, maxHeight);
+			}
+
+			if (current.aspectRatio) {
+				if (width > maxWidth) {
+					width = maxWidth;
+					height = ((width - padding2) / ratio) + padding2;
+				}
+
+				if (height > maxHeight) {
+					height = maxHeight;
+					width = ((height - padding2) * ratio) + padding2;
+				}
+
+				if (width < minWidth) {
+					width = minWidth;
+					height = ((width - padding2) / ratio) + padding2;
+				}
+
+				if (height < minHeight) {
+					height = minHeight;
+					width = ((height - padding2) * ratio) + padding2;
+				}
+
+			} else {
+				width = Math.max(minWidth, Math.min(width, maxWidth));
+				height = Math.max(minHeight, Math.min(height, maxHeight));
+			}
+
+			width = Math.round(width);
+			height = Math.round(height);
+
+			//Reset dimensions
+			$(wrap.add(inner)).width('auto').height('auto');
+
+			inner.width(width - padding2).height(height - padding2);
+			wrap.width(width);
+
+			height_ = wrap.height(); // Real wrap height
+
+			//Fit wrapper inside
+			if (width > maxWidth || height_ > maxHeight) {
+				while ((width > maxWidth || height_ > maxHeight) && width > minWidth && height_ > minHeight) {
+					height = height - 10;
+
+					if (current.aspectRatio) {
+						width = Math.round(((height - padding2) * ratio) + padding2);
+
+						if (width < minWidth) {
+							width = minWidth;
+							height = ((width - padding2) / ratio) + padding2;
+						}
+
+					} else {
+						width = width - 10;
+					}
+
+					inner.width(width - padding2).height(height - padding2);
+					wrap.width(width);
+
+					height_ = wrap.height();
+				}
+			}
+
+			current.dim = {
+				width	: getValue(width),
+				height	: getValue(height_)
+			};
+
+			current.canGrow		= current.autoSize && height > minHeight && height < maxHeight;
+			current.canShrink	= false;
+			current.canExpand	= false;
+
+			if ((width - padding2) < current.width || (height - padding2) < current.height) {
+				current.canExpand = true;
+
+			} else if ((width > viewport.w || height_ > viewport.h) && width > minWidth && height > minHeight) {
+				current.canShrink = true;
+			}
+
+			F.innerSpace = height_ - padding2 - inner.height();
+		},
+
+		_getPosition: function (onlyAbsolute) {
+			var current		= F.current,
+				viewport    = F.getViewport(),
+				margin      = current.margin,
+				width       = F.wrap.width() + margin[1] + margin[3],
+				height      = F.wrap.height() + margin[0] + margin[2],
+				rez         = {
+					position: 'absolute',
+					top  : margin[0] + viewport.y,
+					left : margin[3] + viewport.x
+				};
+
+			if (current.autoCenter && current.fixed && !onlyAbsolute && height <= viewport.h && width <= viewport.w) {
+				rez = {
+					position: 'fixed',
+					top  : margin[0],
+					left : margin[3]
+				};
+			}
+
+			rez.top     = getValue(Math.max(rez.top, rez.top + ((viewport.h - height) * current.topRatio)));
+			rez.left    = getValue(Math.max(rez.left, rez.left + ((viewport.w - width) * 0.5)));
+
+			return rez;
+		},
+
+		_afterZoomIn: function () {
+			var current = F.current, scrolling = current ? current.scrolling : 'no';
+
+			if (!current) {
+				return;
+			}
+
+			F.isOpen = F.isOpened = true;
+
+			F.wrap.addClass('fancybox-opened');
+
+			F.inner.css('overflow', scrolling === 'yes' ? 'scroll' : (scrolling === 'no' ? 'hidden' : scrolling));
+
+			F.trigger('afterShow');
+
+			F.update();
+
+			//Assign a click event
+			if (current.closeClick || current.nextClick) {
+				F.inner.css('cursor', 'pointer').bind('click.fb', function(e) {
+					if (!$(e.target).is('a') && !$(e.target).parent().is('a')) {
+						F[ current.closeClick ? 'close' : 'next' ]();
+					}
+				});
+			}
+
+			//Create a close button
+			if (current.closeBtn) {
+				$(current.tpl.closeBtn).appendTo(F.skin).bind('click.fb', F.close);
+			}
+
+			//Create navigation arrows
+			if (current.arrows && F.group.length > 1) {
+				if (current.loop || current.index > 0) {
+					$(current.tpl.prev).appendTo(F.outer).bind('click.fb', F.prev);
+				}
+
+				if (current.loop || current.index < F.group.length - 1) {
+					$(current.tpl.next).appendTo(F.outer).bind('click.fb', F.next);
+				}
+			}
+
+			if (F.opts.autoPlay && !F.player.isActive) {
+				F.opts.autoPlay = false;
+
+				F.play();
+			}
+		},
+
+		_afterZoomOut: function () {
+			var current = F.current;
+
+			F.wrap.trigger('onReset').remove();
+
+			$.extend(F, {
+				group: {},
+				opts: {},
+				current: null,
+				isActive: false,
+				isOpened: false,
+				isOpen: false,
+				wrap: null,
+				skin: null,
+				outer: null,
+				inner: null
+			});
+
+			F.trigger('afterClose', current);
+		}
+	});
+
+	/*
+	 *	Default transitions
+	 */
+
+	F.transitions = {
+		getOrigPosition: function () {
+			var current = F.current,
+				element = current.element,
+				padding = current.padding,
+				orig    = $(current.orig),
+				pos     = {},
+				width   = 50,
+				height  = 50,
+				viewport;
+
+			if (!orig.length && current.isDom && $(element).is(':visible')) {
+				orig = $(element).find('img:first');
+
+				if (!orig.length) {
+					orig = $(element);
+				}
+			}
+
+			if (orig.length) {
+				pos = orig.offset();
+
+				if (orig.is('img')) {
+					width = orig.outerWidth();
+					height = orig.outerHeight();
+				}
+
+			} else {
+				viewport = F.getViewport();
+
+				pos.top  = viewport.y + (viewport.h - height) * 0.5;
+				pos.left = viewport.x + (viewport.w - width) * 0.5;
+			}
+
+			pos = {
+				top     : getValue(pos.top - padding),
+				left    : getValue(pos.left - padding),
+				width   : getValue(width + padding * 2),
+				height  : getValue(height + padding * 2)
+			};
+
+			return pos;
+		},
+
+		step: function (now, fx) {
+			var prop = fx.prop, value, ratio;
+
+			if (prop === 'width' || prop === 'height') {
+				value = Math.ceil(now - (F.current.padding * 2));
+
+				if (prop === 'height') {
+					ratio = (now - fx.start) / (fx.end - fx.start);
+
+					if (fx.start > fx.end) {
+						ratio = 1 - ratio;
+					}
+
+					value -= F.innerSpace * ratio;
+				}
+
+				F.inner[prop](value);
+			}
+		},
+
+		zoomIn: function () {
+			var wrap     = F.wrap,
+				current  = F.current,
+				effect   = current.openEffect,
+				elastic  = effect === 'elastic',
+				dim      = current.dim,
+				startPos = $.extend({}, dim, F._getPosition( elastic )),
+				endPos   = $.extend({opacity : 1}, startPos);
+
+			//Remove "position" property that breaks older IE
+			delete endPos.position;
+
+			if (elastic) {
+				startPos = this.getOrigPosition();
+
+				if (current.openOpacity) {
+					startPos.opacity = 0;
+				}
+
+				F.outer.add(F.inner).width('auto').height('auto');
+
+			} else if (effect === 'fade') {
+				startPos.opacity = 0;
+			}
+
+			wrap.css(startPos)
+				.show()
+				.animate(endPos, {
+					duration : effect === 'none' ? 0 : current.openSpeed,
+					easing   : current.openEasing,
+					step     : elastic ? this.step : null,
+					complete : F._afterZoomIn
+				});
+		},
+
+		zoomOut: function () {
+			var wrap     = F.wrap,
+				current  = F.current,
+				effect   = current.openEffect,
+				elastic  = effect === 'elastic',
+				endPos   = {opacity : 0};
+
+			if (elastic) {
+				if (wrap.css('position') === 'fixed') {
+					wrap.css(F._getPosition(true));
+				}
+
+				endPos = this.getOrigPosition();
+
+				if (current.closeOpacity) {
+					endPos.opacity = 0;
+				}
+			}
+
+			wrap.animate(endPos, {
+				duration : effect === 'none' ? 0 : current.closeSpeed,
+				easing   : current.closeEasing,
+				step     : elastic ? this.step : null,
+				complete : F._afterZoomOut
+			});
+		},
+
+		changeIn: function () {
+			var wrap     = F.wrap,
+				current  = F.current,
+				effect   = current.nextEffect,
+				elastic  = effect === 'elastic',
+				startPos = F._getPosition( elastic ),
+				endPos   = { opacity : 1 };
+
+			startPos.opacity = 0;
+
+			if (elastic) {
+				startPos.top = getValue(parseInt(startPos.top, 10) - 200);
+				endPos.top = '+=200px';
+			}
+
+			wrap.css(startPos)
+				.show()
+				.animate(endPos, {
+					duration : effect === 'none' ? 0 : current.nextSpeed,
+					easing   : current.nextEasing,
+					complete : F._afterZoomIn
+				});
+		},
+
+		changeOut: function () {
+			var wrap     = F.wrap,
+				current  = F.current,
+				effect   = current.prevEffect,
+				endPos   = { opacity : 0 },
+				cleanUp  = function () {
+					$(this).trigger('onReset').remove();
+				};
+
+			wrap.removeClass('fancybox-opened');
+
+			if (effect === 'elastic') {
+				endPos.top = '+=200px';
+			}
+
+			wrap.animate(endPos, {
+				duration : effect === 'none' ? 0 : current.prevSpeed,
+				easing   : current.prevEasing,
+				complete : cleanUp
+			});
+		}
+	};
+
+	/*
+	 *	Overlay helper
+	 */
+
+	F.helpers.overlay = {
+		overlay: null,
+
+		update: function () {
+			var width, scrollWidth, offsetWidth;
+
+			//Reset width/height so it will not mess
+			this.overlay.width('100%').height('100%');
+
+			if ($.browser.msie || isTouch) {
+				scrollWidth = Math.max(document.documentElement.scrollWidth, document.body.scrollWidth);
+				offsetWidth = Math.max(document.documentElement.offsetWidth, document.body.offsetWidth);
+
+				width = scrollWidth < offsetWidth ? W.width() : scrollWidth;
+
+			} else {
+				width = D.width();
+			}
+
+			this.overlay.width(width).height(D.height());
+		},
+
+		beforeShow: function (opts) {
+			if (this.overlay) {
+				return;
+			}
+
+			opts = $.extend(true, {}, F.defaults.helpers.overlay, opts);
+
+			this.overlay = $('<div id="fancybox-overlay"></div>').css(opts.css).appendTo('body');
+
+			if (opts.closeClick) {
+				this.overlay.bind('click.fb', F.close);
+			}
+
+			if (F.current.fixed && !isTouch) {
+				this.overlay.addClass('overlay-fixed');
+
+			} else {
+				this.update();
+
+				this.onUpdate = function () {
+					this.update();
+				};
+			}
+
+			this.overlay.fadeTo(opts.speedIn, opts.opacity);
+		},
+
+		afterClose: function (opts) {
+			if (this.overlay) {
+				this.overlay.fadeOut(opts.speedOut || 0, function () {
+					$(this).remove();
+				});
+			}
+
+			this.overlay = null;
+		}
+	};
+
+	/*
+	 *	Title helper
+	 */
+
+	F.helpers.title = {
+		beforeShow: function (opts) {
+			var title, text = F.current.title;
+
+			if (text) {
+				title = $('<div class="fancybox-title fancybox-title-' + opts.type + '-wrap">' + text + '</div>').appendTo('body');
+
+				if (opts.type === 'float') {
+					//This helps for some browsers
+					title.width(title.width());
+
+					title.wrapInner('<span class="child"></span>');
+
+					//Increase bottom margin so this title will also fit into viewport
+					F.current.margin[2] += Math.abs(parseInt(title.css('margin-bottom'), 10));
+				}
+
+				title.appendTo(opts.type === 'over' ? F.inner : (opts.type === 'outside' ? F.wrap : F.skin));
+			}
+		}
+	};
+
+	// jQuery plugin initialization
+	$.fn.fancybox = function (options) {
+		var that     = $(this),
+			selector = this.selector || '',
+			index,
+			run      = function(e) {
+				var what = this, idx = index, relType, relVal;
+
+				if (!(e.ctrlKey || e.altKey || e.shiftKey || e.metaKey) && !$(what).is('.fancybox-wrap')) {
+					e.preventDefault();
+
+					relType = options.groupAttr || 'data-fancybox-group';
+					relVal  = $(what).attr(relType);
+
+					if (!relVal) {
+						relType = 'rel';
+						relVal  = what[ relType ];
+					}
+
+					if (relVal && relVal !== '' && relVal !== 'nofollow') {
+						what = selector.length ? $(selector) : that;
+						what = what.filter('[' + relType + '="' + relVal + '"]');
+						idx  = what.index(this);
+					}
+
+					options.index = idx;
+
+					F.open(what, options);
+				}
+			};
+
+		options = options || {};
+		index   = options.index || 0;
+
+		if (selector) {
+			D.undelegate(selector, 'click.fb-start').delegate(selector, 'click.fb-start', run);
+
+		} else {
+			that.unbind('click.fb-start').bind('click.fb-start', run);
+		}
+
+		return this;
+	};
+
+	// Test for fixedPosition needs a body at doc ready
+	$(document).ready(function() {
+		F.defaults.fixed = $.support.fixedPosition || (!($.browser.msie && $.browser.version <= 6) && !isTouch);
+	});
+
+}(window, document, jQuery));
\ No newline at end of file

=== added file 'media/fancybox/jquery.fancybox.pack.js'
--- media/fancybox/jquery.fancybox.pack.js	1970-01-01 00:00:00 +0000
+++ media/fancybox/jquery.fancybox.pack.js	2012-07-11 17:31:35 +0000
@@ -0,0 +1,35 @@
+/*! fancyBox v2.0.6 fancyapps.com | fancyapps.com/fancybox/#license */
+(function(s,l,d,t){var m=d(s),q=d(l),a=d.fancybox=function(){a.open.apply(this,arguments)},u=!1,k=l.createTouch!==t,o=function(a){return"string"===d.type(a)},n=function(b,c){c&&o(b)&&0<b.indexOf("%")&&(b=a.getViewport()[c]/100*parseInt(b,10));return Math.round(b)+"px"};d.extend(a,{version:"2.0.5",defaults:{padding:15,margin:20,width:800,height:600,minWidth:100,minHeight:100,maxWidth:9999,maxHeight:9999,autoSize:!0,autoResize:!k,autoCenter:!k,fitToView:!0,aspectRatio:!1,topRatio:0.5,fixed:!1,scrolling:"auto",
+wrapCSS:"",arrows:!0,closeBtn:!0,closeClick:!1,nextClick:!1,mouseWheel:!0,autoPlay:!1,playSpeed:3E3,preload:3,modal:!1,loop:!0,ajax:{dataType:"html",headers:{"X-fancyBox":!0}},keys:{next:[13,32,34,39,40],prev:[8,33,37,38],close:[27]},tpl:{wrap:'<div class="fancybox-wrap"><div class="fancybox-skin"><div class="fancybox-outer"><div class="fancybox-inner"></div></div></div></div>',image:'<img class="fancybox-image" src="{href}" alt="" />',iframe:'<iframe class="fancybox-iframe" name="fancybox-frame{rnd}" frameborder="0" hspace="0"'+
+(d.browser.msie?' allowtransparency="true"':"")+"></iframe>",swf:'<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="100%" height="100%"><param name="wmode" value="transparent" /><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="movie" value="{href}" /><embed src="{href}" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="100%" height="100%" wmode="transparent"></embed></object>',error:'<p class="fancybox-error">The requested content cannot be loaded.<br/>Please try again later.</p>',
+closeBtn:'<div title="Close" class="fancybox-item fancybox-close"></div>',next:'<a title="Next" class="fancybox-nav fancybox-next"><span></span></a>',prev:'<a title="Previous" class="fancybox-nav fancybox-prev"><span></span></a>'},openEffect:"fade",openSpeed:300,openEasing:"swing",openOpacity:!0,openMethod:"zoomIn",closeEffect:"fade",closeSpeed:300,closeEasing:"swing",closeOpacity:!0,closeMethod:"zoomOut",nextEffect:"elastic",nextSpeed:300,nextEasing:"swing",nextMethod:"changeIn",prevEffect:"elastic",
+prevSpeed:300,prevEasing:"swing",prevMethod:"changeOut",helpers:{overlay:{speedIn:0,speedOut:300,opacity:0.8,css:{cursor:"pointer"},closeClick:!0},title:{type:"float"}}},group:{},opts:{},coming:null,current:null,isOpen:!1,isOpened:!1,player:{timer:null,isActive:!1},ajaxLoad:null,imgPreload:null,transitions:{},helpers:{},open:function(b,c){a.close(!0);b&&!d.isArray(b)&&(b=b instanceof d?d(b).get():[b]);a.isActive=!0;a.opts=d.extend(!0,{},a.defaults,c);d.isPlainObject(c)&&c.keys!==t&&(a.opts.keys=c.keys?
+d.extend({},a.defaults.keys,c.keys):!1);a.group=b;a._start(a.opts.index||0)},cancel:function(){a.coming&&!1===a.trigger("onCancel")||(a.coming=null,a.hideLoading(),a.ajaxLoad&&a.ajaxLoad.abort(),a.ajaxLoad=null,a.imgPreload&&(a.imgPreload.onload=a.imgPreload.onabort=a.imgPreload.onerror=null))},close:function(b){a.cancel();a.current&&!1!==a.trigger("beforeClose")&&(a.unbindEvents(),!a.isOpen||b&&!0===b[0]?(d(".fancybox-wrap").stop().trigger("onReset").remove(),a._afterZoomOut()):(a.isOpen=a.isOpened=
+!1,d(".fancybox-item, .fancybox-nav").remove(),a.wrap.stop(!0).removeClass("fancybox-opened"),a.inner.css("overflow","hidden"),a.transitions[a.current.closeMethod]()))},play:function(b){var c=function(){clearTimeout(a.player.timer)},e=function(){c();a.current&&a.player.isActive&&(a.player.timer=setTimeout(a.next,a.current.playSpeed))},f=function(){c();d("body").unbind(".player");a.player.isActive=!1;a.trigger("onPlayEnd")};if(a.player.isActive||b&&!1===b[0])f();else if(a.current&&(a.current.loop||
+a.current.index<a.group.length-1))a.player.isActive=!0,d("body").bind({"afterShow.player onUpdate.player":e,"onCancel.player beforeClose.player":f,"beforeLoad.player":c}),e(),a.trigger("onPlayStart")},next:function(){a.current&&a.jumpto(a.current.index+1)},prev:function(){a.current&&a.jumpto(a.current.index-1)},jumpto:function(b){a.current&&(b=parseInt(b,10),1<a.group.length&&a.current.loop&&(b>=a.group.length?b=0:0>b&&(b=a.group.length-1)),a.group[b]!==t&&(a.cancel(),a._start(b)))},reposition:function(b,
+c){var e;a.isOpen&&(e=a._getPosition(c),b&&"scroll"===b.type?(delete e.position,a.wrap.stop(!0,!0).animate(e,200)):a.wrap.css(e))},update:function(b){a.isOpen&&(u||setTimeout(function(){var c=a.current,e=!b||b&&"orientationchange"===b.type;if(u&&(u=!1,c)){if(!b||"scroll"!==b.type||e)c.autoSize&&"iframe"!==c.type&&(a.inner.height("auto"),c.height=a.inner.height()),(c.autoResize||e)&&a._setDimension(),c.canGrow&&"iframe"!==c.type&&a.inner.height("auto");(c.autoCenter||e)&&a.reposition(b);a.trigger("onUpdate")}},
+200),u=!0)},toggle:function(){a.isOpen&&(a.current.fitToView=!a.current.fitToView,a.update())},hideLoading:function(){q.unbind("keypress.fb");d("#fancybox-loading").remove()},showLoading:function(){a.hideLoading();q.bind("keypress.fb",function(b){27===b.keyCode&&(b.preventDefault(),a.cancel())});d('<div id="fancybox-loading"><div></div></div>').click(a.cancel).appendTo("body")},getViewport:function(){return{x:m.scrollLeft(),y:m.scrollTop(),w:k&&s.innerWidth?s.innerWidth:m.width(),h:k&&s.innerHeight?
+s.innerHeight:m.height()}},unbindEvents:function(){a.wrap&&a.wrap.unbind(".fb");q.unbind(".fb");m.unbind(".fb")},bindEvents:function(){var b=a.current,c=b.keys;b&&(m.bind("resize.fb orientationchange.fb"+(b.autoCenter&&!b.fixed?" scroll.fb":""),a.update),c&&q.bind("keydown.fb",function(b){var f;f=b.target||b.srcElement;if(!b.ctrlKey&&!b.altKey&&!b.shiftKey&&!b.metaKey&&(!f||!f.type&&!d(f).is("[contenteditable]")))f=b.keyCode,-1<d.inArray(f,c.close)?(a.close(),b.preventDefault()):-1<d.inArray(f,c.next)?
+(a.next(),b.preventDefault()):-1<d.inArray(f,c.prev)&&(a.prev(),b.preventDefault())}),d.fn.mousewheel&&b.mouseWheel&&1<a.group.length&&a.wrap.bind("mousewheel.fb",function(b,c){var d=b.target||null;if(0!==c&&(!d||0===d.clientHeight||d.scrollHeight===d.clientHeight&&d.scrollWidth===d.clientWidth))b.preventDefault(),a[0<c?"prev":"next"]()}))},trigger:function(b,c){var e,f=c||a[-1<d.inArray(b,["onCancel","beforeLoad","afterLoad"])?"coming":"current"];if(f){d.isFunction(f[b])&&(e=f[b].apply(f,Array.prototype.slice.call(arguments,
+1)));if(!1===e)return!1;f.helpers&&d.each(f.helpers,function(c,e){if(e&&d.isPlainObject(a.helpers[c])&&d.isFunction(a.helpers[c][b]))a.helpers[c][b](e,f)});d.event.trigger(b+".fb")}},isImage:function(a){return o(a)&&a.match(/\.(jpe?g|gif|png|bmp)((\?|#).*)?$/i)},isSWF:function(a){return o(a)&&a.match(/\.(swf)((\?|#).*)?$/i)},_start:function(b){var c={},e=a.group[b]||null,f,g,i;if(e&&(e.nodeType||e instanceof d))f=!0,d.metadata&&(c=d(e).metadata());c=d.extend(!0,{},a.opts,{index:b,element:e},d.isPlainObject(e)?
+e:c);d.each(["href","title","content","type"],function(b,g){c[g]=a.opts[g]||f&&d(e).attr(g)||c[g]||null});"number"===typeof c.margin&&(c.margin=[c.margin,c.margin,c.margin,c.margin]);c.modal&&d.extend(!0,c,{closeBtn:!1,closeClick:!1,nextClick:!1,arrows:!1,mouseWheel:!1,keys:null,helpers:{overlay:{css:{cursor:"auto"},closeClick:!1}}});a.coming=c;if(!1===a.trigger("beforeLoad"))a.coming=null;else{g=c.type;b=c.href||e;g||(f&&(g=d(e).data("fancybox-type"),g||(g=(g=e.className.match(/fancybox\.(\w+)/))?
+g[1]:null)),!g&&o(b)&&(a.isImage(b)?g="image":a.isSWF(b)?g="swf":b.match(/^#/)&&(g="inline")),g||(g=f?"inline":"html"),c.type=g);if("inline"===g||"html"===g){if(c.content||(c.content="inline"===g?d(o(b)?b.replace(/.*(?=#[^\s]+$)/,""):b):e),!c.content||!c.content.length)g=null}else b||(g=null);"ajax"===g&&o(b)&&(i=b.split(/\s+/,2),b=i.shift(),c.selector=i.shift());c.href=b;c.group=a.group;c.isDom=f;switch(g){case "image":a._loadImage();break;case "ajax":a._loadAjax();break;case "inline":case "iframe":case "swf":case "html":a._afterLoad();
+break;default:a._error("type")}}},_error:function(b){a.hideLoading();d.extend(a.coming,{type:"html",autoSize:!0,minWidth:0,minHeight:0,padding:15,hasError:b,content:a.coming.tpl.error});a._afterLoad()},_loadImage:function(){var b=a.imgPreload=new Image;b.onload=function(){this.onload=this.onerror=null;a.coming.width=this.width;a.coming.height=this.height;a._afterLoad()};b.onerror=function(){this.onload=this.onerror=null;a._error("image")};b.src=a.coming.href;(b.complete===t||!b.complete)&&a.showLoading()},
+_loadAjax:function(){a.showLoading();a.ajaxLoad=d.ajax(d.extend({},a.coming.ajax,{url:a.coming.href,error:function(b,c){a.coming&&"abort"!==c?a._error("ajax",b):a.hideLoading()},success:function(b,c){"success"===c&&(a.coming.content=b,a._afterLoad())}}))},_preloadImages:function(){var b=a.group,c=a.current,e=b.length,f,g,i,h=Math.min(c.preload,e-1);if(c.preload&&!(2>b.length))for(i=1;i<=h;i+=1)if(f=b[(c.index+i)%e],g=f.href||d(f).attr("href")||f,"image"===f.type||a.isImage(g))(new Image).src=g},_afterLoad:function(){a.hideLoading();
+!a.coming||!1===a.trigger("afterLoad",a.current)?a.coming=!1:(a.isOpened?(d(".fancybox-item, .fancybox-nav").remove(),a.wrap.stop(!0).removeClass("fancybox-opened"),a.inner.css("overflow","hidden"),a.transitions[a.current.prevMethod]()):(d(".fancybox-wrap").stop().trigger("onReset").remove(),a.trigger("afterClose")),a.unbindEvents(),a.isOpen=!1,a.current=a.coming,a.wrap=d(a.current.tpl.wrap).addClass("fancybox-"+(k?"mobile":"desktop")+" fancybox-type-"+a.current.type+" fancybox-tmp "+a.current.wrapCSS).appendTo("body"),
+a.skin=d(".fancybox-skin",a.wrap).css("padding",n(a.current.padding)),a.outer=d(".fancybox-outer",a.wrap),a.inner=d(".fancybox-inner",a.wrap),a._setContent())},_setContent:function(){var b=a.current,c=b.content,e=b.type,f=b.minWidth,g=b.minHeight,i=b.maxWidth,h=b.maxHeight;switch(e){case "inline":case "ajax":case "html":b.selector?c=d("<div>").html(c).find(b.selector):c instanceof d&&(c.parent().hasClass("fancybox-inner")&&c.parents(".fancybox-wrap").unbind("onReset"),c=c.show().detach(),d(a.wrap).bind("onReset",
+function(){c.appendTo("body").hide()}));b.autoSize&&(f=d('<div class="fancybox-wrap '+a.current.wrapCSS+' fancybox-tmp"></div>').appendTo("body").css({minWidth:n(f,"w"),minHeight:n(g,"h"),maxWidth:n(i,"w"),maxHeight:n(h,"h")}).append(c),b.width=f.width(),b.height=f.height(),f.width(a.current.width),f.height()>b.height&&(f.width(b.width+1),b.width=f.width(),b.height=f.height()),c=f.contents().detach(),f.remove());break;case "image":c=b.tpl.image.replace("{href}",b.href);b.aspectRatio=!0;break;case "swf":c=
+b.tpl.swf.replace(/\{width\}/g,b.width).replace(/\{height\}/g,b.height).replace(/\{href\}/g,b.href);break;case "iframe":c=d(b.tpl.iframe.replace("{rnd}",(new Date).getTime())).attr("scrolling",b.scrolling).attr("src",b.href),b.scrolling=k?"scroll":"auto"}if("image"===e||"swf"===e)b.autoSize=!1,b.scrolling="visible";"iframe"===e&&b.autoSize?(a.showLoading(),a._setDimension(),a.inner.css("overflow",b.scrolling),c.bind({onCancel:function(){d(this).unbind();a._afterZoomOut()},load:function(){a.hideLoading();
+try{this.contentWindow.document.location&&(a.current.height=d(this).contents().find("body").height())}catch(b){a.current.autoSize=!1}a[a.isOpen?"_afterZoomIn":"_beforeShow"]()}}).appendTo(a.inner)):(a.inner.append(c),a._beforeShow())},_beforeShow:function(){a.coming=null;a.trigger("beforeShow");a._setDimension();a.wrap.hide().removeClass("fancybox-tmp");a.bindEvents();a._preloadImages();a.transitions[a.isOpened?a.current.nextMethod:a.current.openMethod]()},_setDimension:function(){var b=a.wrap,c=
+a.inner,e=a.current,f=a.getViewport(),g=e.margin,i=2*e.padding,h=e.width,j=e.height,r=e.maxWidth+i,k=e.maxHeight+i,l=e.minWidth+i,m=e.minHeight+i,p;f.w-=g[1]+g[3];f.h-=g[0]+g[2];o(h)&&0<h.indexOf("%")&&(h=(f.w-i)*parseFloat(h)/100);o(j)&&0<j.indexOf("%")&&(j=(f.h-i)*parseFloat(j)/100);g=h/j;h+=i;j+=i;e.fitToView&&(r=Math.min(f.w,r),k=Math.min(f.h,k));if(e.aspectRatio){if(h>r&&(h=r,j=(h-i)/g+i),j>k&&(j=k,h=(j-i)*g+i),h<l&&(h=l,j=(h-i)/g+i),j<m)j=m,h=(j-i)*g+i}else h=Math.max(l,Math.min(h,r)),j=Math.max(m,
+Math.min(j,k));h=Math.round(h);j=Math.round(j);d(b.add(c)).width("auto").height("auto");c.width(h-i).height(j-i);b.width(h);p=b.height();if(h>r||p>k)for(;(h>r||p>k)&&h>l&&p>m;)j-=10,e.aspectRatio?(h=Math.round((j-i)*g+i),h<l&&(h=l,j=(h-i)/g+i)):h-=10,c.width(h-i).height(j-i),b.width(h),p=b.height();e.dim={width:n(h),height:n(p)};e.canGrow=e.autoSize&&j>m&&j<k;e.canShrink=!1;e.canExpand=!1;if(h-i<e.width||j-i<e.height)e.canExpand=!0;else if((h>f.w||p>f.h)&&h>l&&j>m)e.canShrink=!0;a.innerSpace=p-i-
+c.height()},_getPosition:function(b){var c=a.current,e=a.getViewport(),f=c.margin,d=a.wrap.width()+f[1]+f[3],i=a.wrap.height()+f[0]+f[2],h={position:"absolute",top:f[0]+e.y,left:f[3]+e.x};c.autoCenter&&c.fixed&&!b&&i<=e.h&&d<=e.w&&(h={position:"fixed",top:f[0],left:f[3]});h.top=n(Math.max(h.top,h.top+(e.h-i)*c.topRatio));h.left=n(Math.max(h.left,h.left+0.5*(e.w-d)));return h},_afterZoomIn:function(){var b=a.current,c=b?b.scrolling:"no";if(b&&(a.isOpen=a.isOpened=!0,a.wrap.addClass("fancybox-opened"),
+a.inner.css("overflow","yes"===c?"scroll":"no"===c?"hidden":c),a.trigger("afterShow"),a.update(),(b.closeClick||b.nextClick)&&a.inner.css("cursor","pointer").bind("click.fb",function(c){if(!d(c.target).is("a")&&!d(c.target).parent().is("a"))a[b.closeClick?"close":"next"]()}),b.closeBtn&&d(b.tpl.closeBtn).appendTo(a.skin).bind("click.fb",a.close),b.arrows&&1<a.group.length&&((b.loop||0<b.index)&&d(b.tpl.prev).appendTo(a.outer).bind("click.fb",a.prev),(b.loop||b.index<a.group.length-1)&&d(b.tpl.next).appendTo(a.outer).bind("click.fb",
+a.next)),a.opts.autoPlay&&!a.player.isActive))a.opts.autoPlay=!1,a.play()},_afterZoomOut:function(){var b=a.current;a.wrap.trigger("onReset").remove();d.extend(a,{group:{},opts:{},current:null,isActive:!1,isOpened:!1,isOpen:!1,wrap:null,skin:null,outer:null,inner:null});a.trigger("afterClose",b)}});a.transitions={getOrigPosition:function(){var b=a.current,c=b.element,e=b.padding,f=d(b.orig),g={},i=50,h=50;!f.length&&b.isDom&&d(c).is(":visible")&&(f=d(c).find("img:first"),f.length||(f=d(c)));f.length?
+(g=f.offset(),f.is("img")&&(i=f.outerWidth(),h=f.outerHeight())):(b=a.getViewport(),g.top=b.y+0.5*(b.h-h),g.left=b.x+0.5*(b.w-i));return g={top:n(g.top-e),left:n(g.left-e),width:n(i+2*e),height:n(h+2*e)}},step:function(b,c){var e=c.prop,d,g;if("width"===e||"height"===e)d=Math.ceil(b-2*a.current.padding),"height"===e&&(g=(b-c.start)/(c.end-c.start),c.start>c.end&&(g=1-g),d-=a.innerSpace*g),a.inner[e](d)},zoomIn:function(){var b=a.wrap,c=a.current,e=c.openEffect,f="elastic"===e,g=d.extend({},c.dim,
+a._getPosition(f)),i=d.extend({opacity:1},g);delete i.position;f?(g=this.getOrigPosition(),c.openOpacity&&(g.opacity=0),a.outer.add(a.inner).width("auto").height("auto")):"fade"===e&&(g.opacity=0);b.css(g).show().animate(i,{duration:"none"===e?0:c.openSpeed,easing:c.openEasing,step:f?this.step:null,complete:a._afterZoomIn})},zoomOut:function(){var b=a.wrap,c=a.current,d=c.openEffect,f="elastic"===d,g={opacity:0};f&&("fixed"===b.css("position")&&b.css(a._getPosition(!0)),g=this.getOrigPosition(),c.closeOpacity&&
+(g.opacity=0));b.animate(g,{duration:"none"===d?0:c.closeSpeed,easing:c.closeEasing,step:f?this.step:null,complete:a._afterZoomOut})},changeIn:function(){var b=a.wrap,c=a.current,d=c.nextEffect,f="elastic"===d,g=a._getPosition(f),i={opacity:1};g.opacity=0;f&&(g.top=n(parseInt(g.top,10)-200),i.top="+=200px");b.css(g).show().animate(i,{duration:"none"===d?0:c.nextSpeed,easing:c.nextEasing,complete:a._afterZoomIn})},changeOut:function(){var b=a.wrap,c=a.current,e=c.prevEffect,f={opacity:0};b.removeClass("fancybox-opened");
+"elastic"===e&&(f.top="+=200px");b.animate(f,{duration:"none"===e?0:c.prevSpeed,easing:c.prevEasing,complete:function(){d(this).trigger("onReset").remove()}})}};a.helpers.overlay={overlay:null,update:function(){var a,c;this.overlay.width("100%").height("100%");d.browser.msie||k?(a=Math.max(l.documentElement.scrollWidth,l.body.scrollWidth),c=Math.max(l.documentElement.offsetWidth,l.body.offsetWidth),a=a<c?m.width():a):a=q.width();this.overlay.width(a).height(q.height())},beforeShow:function(b){this.overlay||
+(b=d.extend(!0,{},a.defaults.helpers.overlay,b),this.overlay=d('<div id="fancybox-overlay"></div>').css(b.css).appendTo("body"),b.closeClick&&this.overlay.bind("click.fb",a.close),a.current.fixed&&!k?this.overlay.addClass("overlay-fixed"):(this.update(),this.onUpdate=function(){this.update()}),this.overlay.fadeTo(b.speedIn,b.opacity))},afterClose:function(a){this.overlay&&this.overlay.fadeOut(a.speedOut||0,function(){d(this).remove()});this.overlay=null}};a.helpers.title={beforeShow:function(b){var c;
+if(c=a.current.title)c=d('<div class="fancybox-title fancybox-title-'+b.type+'-wrap">'+c+"</div>").appendTo("body"),"float"===b.type&&(c.width(c.width()),c.wrapInner('<span class="child"></span>'),a.current.margin[2]+=Math.abs(parseInt(c.css("margin-bottom"),10))),c.appendTo("over"===b.type?a.inner:"outside"===b.type?a.wrap:a.skin)}};d.fn.fancybox=function(b){var c=d(this),e=this.selector||"",f,g=function(g){var h=this,j=f,k;!g.ctrlKey&&!g.altKey&&!g.shiftKey&&!g.metaKey&&!d(h).is(".fancybox-wrap")&&
+(g.preventDefault(),g=b.groupAttr||"data-fancybox-group",k=d(h).attr(g),k||(g="rel",k=h[g]),k&&""!==k&&"nofollow"!==k&&(h=e.length?d(e):c,h=h.filter("["+g+'="'+k+'"]'),j=h.index(this)),b.index=j,a.open(h,b))},b=b||{};f=b.index||0;e?q.undelegate(e,"click.fb-start").delegate(e,"click.fb-start",g):c.unbind("click.fb-start").bind("click.fb-start",g);return this};d(l).ready(function(){a.defaults.fixed=d.support.fixedPosition||!(d.browser.msie&&6>=d.browser.version)&&!k})})(window,document,jQuery);
\ No newline at end of file

=== added file 'media/forum/img/closed.png'
Binary files media/forum/img/closed.png	1970-01-01 00:00:00 +0000 and media/forum/img/closed.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/forum/img/delete.png'
Binary files media/forum/img/delete.png	1970-01-01 00:00:00 +0000 and media/forum/img/delete.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/forum/img/doc_big_work.png'
Binary files media/forum/img/doc_big_work.png	1970-01-01 00:00:00 +0000 and media/forum/img/doc_big_work.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/forum/img/doc_big_work_star.png'
Binary files media/forum/img/doc_big_work_star.png	1970-01-01 00:00:00 +0000 and media/forum/img/doc_big_work_star.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/forum/img/edit.png'
Binary files media/forum/img/edit.png	1970-01-01 00:00:00 +0000 and media/forum/img/edit.png	2012-07-11 17:31:35 +0000 differ
=== removed directory 'media/forum/img/en'
=== removed file 'media/forum/img/en/close_small.png'
Binary files media/forum/img/en/close_small.png	2010-09-23 21:37:00 +0000 and media/forum/img/en/close_small.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/forum/img/en/close_topic.png'
Binary files media/forum/img/en/close_topic.png	2010-09-23 21:37:00 +0000 and media/forum/img/en/close_topic.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/forum/img/en/closed.png'
Binary files media/forum/img/en/closed.png	2010-09-03 13:39:32 +0000 and media/forum/img/en/closed.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/forum/img/en/delete.png'
Binary files media/forum/img/en/delete.png	2010-09-03 13:39:32 +0000 and media/forum/img/en/delete.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/forum/img/en/edit.png'
Binary files media/forum/img/en/edit.png	2010-09-03 13:39:32 +0000 and media/forum/img/en/edit.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/forum/img/en/new_topic.png'
Binary files media/forum/img/en/new_topic.png	2010-09-03 13:39:32 +0000 and media/forum/img/en/new_topic.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/forum/img/en/newtopic.png'
Binary files media/forum/img/en/newtopic.png	2010-09-23 21:37:00 +0000 and media/forum/img/en/newtopic.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/forum/img/en/open_topic.png'
Binary files media/forum/img/en/open_topic.png	2010-09-23 23:28:34 +0000 and media/forum/img/en/open_topic.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/forum/img/en/p_delete.png'
Binary files media/forum/img/en/p_delete.png	2011-07-03 14:00:24 +0000 and media/forum/img/en/p_delete.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/forum/img/en/p_edit.png'
Binary files media/forum/img/en/p_edit.png	2011-07-03 14:00:24 +0000 and media/forum/img/en/p_edit.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/forum/img/en/p_quote.png'
Binary files media/forum/img/en/p_quote.png	2011-07-03 14:00:24 +0000 and media/forum/img/en/p_quote.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/forum/img/en/permalink.png'
Binary files media/forum/img/en/permalink.png	2010-09-03 13:39:32 +0000 and media/forum/img/en/permalink.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/forum/img/en/preview.png'
Binary files media/forum/img/en/preview.png	2010-09-23 21:37:00 +0000 and media/forum/img/en/preview.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/forum/img/en/quote.png'
Binary files media/forum/img/en/quote.png	2010-09-03 13:39:32 +0000 and media/forum/img/en/quote.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/forum/img/en/search.png'
Binary files media/forum/img/en/search.png	2010-09-03 13:39:32 +0000 and media/forum/img/en/search.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/forum/img/en/send.png'
Binary files media/forum/img/en/send.png	2010-09-23 21:37:00 +0000 and media/forum/img/en/send.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/forum/img/en/send_pm.png'
Binary files media/forum/img/en/send_pm.png	2010-09-03 13:39:32 +0000 and media/forum/img/en/send_pm.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/forum/img/en/sendpm.png'
Binary files media/forum/img/en/sendpm.png	2010-09-23 21:37:00 +0000 and media/forum/img/en/sendpm.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/forum/img/en/stick_topic.png'
Binary files media/forum/img/en/stick_topic.png	2010-09-03 13:39:32 +0000 and media/forum/img/en/stick_topic.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/forum/img/en/stick_topic_small.png'
Binary files media/forum/img/en/stick_topic_small.png	2010-09-23 21:37:00 +0000 and media/forum/img/en/stick_topic_small.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/forum/img/en/sticky.png'
Binary files media/forum/img/en/sticky.png	2010-09-03 13:39:32 +0000 and media/forum/img/en/sticky.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/forum/img/en/subscribe.png'
Binary files media/forum/img/en/subscribe.png	2010-09-23 21:37:00 +0000 and media/forum/img/en/subscribe.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/forum/img/en/subscribe_small.png'
Binary files media/forum/img/en/subscribe_small.png	2010-09-23 21:37:00 +0000 and media/forum/img/en/subscribe_small.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/forum/img/en/t_new.png'
Binary files media/forum/img/en/t_new.png	2011-07-03 14:00:24 +0000 and media/forum/img/en/t_new.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/forum/img/en/t_reply.png'
Binary files media/forum/img/en/t_reply.png	2011-07-03 14:00:24 +0000 and media/forum/img/en/t_reply.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/forum/img/en/top.png'
Binary files media/forum/img/en/top.png	2010-09-03 13:39:32 +0000 and media/forum/img/en/top.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/forum/img/en/unstick_topic.png'
Binary files media/forum/img/en/unstick_topic.png	2010-09-23 21:37:00 +0000 and media/forum/img/en/unstick_topic.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/forum/img/en/unsubscribe.png'
Binary files media/forum/img/en/unsubscribe.png	2010-09-03 13:39:32 +0000 and media/forum/img/en/unsubscribe.png	1970-01-01 00:00:00 +0000 differ
=== added file 'media/forum/img/folder_big_work.png'
Binary files media/forum/img/folder_big_work.png	1970-01-01 00:00:00 +0000 and media/forum/img/folder_big_work.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/forum/img/folder_big_work_star.png'
Binary files media/forum/img/folder_big_work_star.png	1970-01-01 00:00:00 +0000 and media/forum/img/folder_big_work_star.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/forum/img/new_topic.png'
Binary files media/forum/img/new_topic.png	1970-01-01 00:00:00 +0000 and media/forum/img/new_topic.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/forum/img/open.png'
Binary files media/forum/img/open.png	1970-01-01 00:00:00 +0000 and media/forum/img/open.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/forum/img/permalink.png'
Binary files media/forum/img/permalink.png	1970-01-01 00:00:00 +0000 and media/forum/img/permalink.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/forum/img/permalink_hover.png'
Binary files media/forum/img/permalink_hover.png	1970-01-01 00:00:00 +0000 and media/forum/img/permalink_hover.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/forum/img/preview.png'
Binary files media/forum/img/preview.png	1970-01-01 00:00:00 +0000 and media/forum/img/preview.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/forum/img/quote.png'
Binary files media/forum/img/quote.png	1970-01-01 00:00:00 +0000 and media/forum/img/quote.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/forum/img/send.png'
Binary files media/forum/img/send.png	1970-01-01 00:00:00 +0000 and media/forum/img/send.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/forum/img/send_pm.png'
Binary files media/forum/img/send_pm.png	1970-01-01 00:00:00 +0000 and media/forum/img/send_pm.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/forum/img/sticky.png'
Binary files media/forum/img/sticky.png	1970-01-01 00:00:00 +0000 and media/forum/img/sticky.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/forum/img/subscribe.png'
Binary files media/forum/img/subscribe.png	1970-01-01 00:00:00 +0000 and media/forum/img/subscribe.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/forum/img/top.png'
Binary files media/forum/img/top.png	1970-01-01 00:00:00 +0000 and media/forum/img/top.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/forum/img/unstick.png'
Binary files media/forum/img/unstick.png	1970-01-01 00:00:00 +0000 and media/forum/img/unstick.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/forum/img/unsubscribe.png'
Binary files media/forum/img/unsubscribe.png	1970-01-01 00:00:00 +0000 and media/forum/img/unsubscribe.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/img/black20.png'
Binary files media/img/black20.png	1970-01-01 00:00:00 +0000 and media/img/black20.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/img/black50.png'
Binary files media/img/black50.png	1970-01-01 00:00:00 +0000 and media/img/black50.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/img/but1.png'
Binary files media/img/but1.png	1970-01-01 00:00:00 +0000 and media/img/but1.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/img/delete.png'
Binary files media/img/delete.png	1970-01-01 00:00:00 +0000 and media/img/delete.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/img/download.png'
Binary files media/img/download.png	1970-01-01 00:00:00 +0000 and media/img/download.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/img/easter.png'
Binary files media/img/easter.png	1970-01-01 00:00:00 +0000 and media/img/easter.png	2012-07-11 17:31:35 +0000 differ
=== added directory 'media/img/lightbox'
=== added file 'media/img/lightbox/lightbox-blank.gif'
Binary files media/img/lightbox/lightbox-blank.gif	1970-01-01 00:00:00 +0000 and media/img/lightbox/lightbox-blank.gif	2012-07-11 17:31:35 +0000 differ
=== added file 'media/img/lightbox/lightbox-btn-close.gif'
Binary files media/img/lightbox/lightbox-btn-close.gif	1970-01-01 00:00:00 +0000 and media/img/lightbox/lightbox-btn-close.gif	2012-07-11 17:31:35 +0000 differ
=== added file 'media/img/lightbox/lightbox-btn-next.gif'
Binary files media/img/lightbox/lightbox-btn-next.gif	1970-01-01 00:00:00 +0000 and media/img/lightbox/lightbox-btn-next.gif	2012-07-11 17:31:35 +0000 differ
=== added file 'media/img/lightbox/lightbox-btn-prev.gif'
Binary files media/img/lightbox/lightbox-btn-prev.gif	1970-01-01 00:00:00 +0000 and media/img/lightbox/lightbox-btn-prev.gif	2012-07-11 17:31:35 +0000 differ
=== added file 'media/img/lightbox/lightbox-ico-loading.gif'
Binary files media/img/lightbox/lightbox-ico-loading.gif	1970-01-01 00:00:00 +0000 and media/img/lightbox/lightbox-ico-loading.gif	2012-07-11 17:31:35 +0000 differ
=== added file 'media/img/parchment.png'
Binary files media/img/parchment.png	1970-01-01 00:00:00 +0000 and media/img/parchment.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/img/replied.png'
Binary files media/img/replied.png	1970-01-01 00:00:00 +0000 and media/img/replied.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/img/smileys/face-confused.png'
Binary files media/img/smileys/face-confused.png	1970-01-01 00:00:00 +0000 and media/img/smileys/face-confused.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/img/smileys/face-cool.png'
Binary files media/img/smileys/face-cool.png	1970-01-01 00:00:00 +0000 and media/img/smileys/face-cool.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/img/smileys/face-mad.png'
Binary files media/img/smileys/face-mad.png	1970-01-01 00:00:00 +0000 and media/img/smileys/face-mad.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/img/smileys/face-shock.png'
Binary files media/img/smileys/face-shock.png	1970-01-01 00:00:00 +0000 and media/img/smileys/face-shock.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/img/smileys/face-tongue.png'
Binary files media/img/smileys/face-tongue.png	1970-01-01 00:00:00 +0000 and media/img/smileys/face-tongue.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/img/smileys/face-upset.png'
Binary files media/img/smileys/face-upset.png	1970-01-01 00:00:00 +0000 and media/img/smileys/face-upset.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/img/undelete.png'
Binary files media/img/undelete.png	1970-01-01 00:00:00 +0000 and media/img/undelete.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/img/welcome.png'
Binary files media/img/welcome.png	1970-01-01 00:00:00 +0000 and media/img/welcome.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/img/wood.png'
Binary files media/img/wood.png	1970-01-01 00:00:00 +0000 and media/img/wood.png	2012-07-11 17:31:35 +0000 differ
=== added file 'media/js/scripts.js'
--- media/js/scripts.js	1970-01-01 00:00:00 +0000
+++ media/js/scripts.js	2012-07-11 17:31:35 +0000
@@ -0,0 +1,15 @@
+$(document).ready(function() { 
+	$('[placeholder]').focus(function() {
+		var input = $(this);
+		if (input.val() == input.attr('placeholder')) {
+			input.val('');
+			input.removeClass('placeholder');
+		}
+	}).blur(function() {
+	var input = $(this);
+		if (input.val() == '' || input.val() == input.attr('placeholder')) {
+			input.addClass('placeholder');
+			input.val(input.attr('placeholder'));
+		}
+	}).blur();
+});

=== added directory 'media/wlprofile'
=== added file 'media/wlprofile/anonymous.png'
Binary files media/wlprofile/anonymous.png	1970-01-01 00:00:00 +0000 and media/wlprofile/anonymous.png	2012-07-11 17:31:35 +0000 differ
=== removed directory 'online_help/templates'
=== removed file 'online_help/templates/inlines/display_building.html'
--- online_help/templates/inlines/display_building.html	2010-11-01 19:02:28 +0000
+++ online_help/templates/inlines/display_building.html	1970-01-01 00:00:00 +0000
@@ -1,232 +0,0 @@
-{% comment %}
-   vim:ft=htmldjango
-{% endcomment %}
-
-      <!-- Header -->
-    <tr>
-
-      {% if b.has_build_cost and b.has_outputs and b.has_stored_wares %}
-            <!-- With build cost and production and stored wares 111 -->
-        <th width="152px"><a href="{% url help_building_details b.tribe.name b.name %}" title="{{ b.displayname }}" name="{{ b.name }}">{{b.displayname|title }}</a></th>
-        <th>Description</th>
-        <th>Build cost</th>
-        <th>Produces</th>
-        <th>Stores</th>
-      {% endif %}
-
-      {% if b.has_build_cost and b.has_outputs and not b.has_stored_wares %}
-            <!-- With build cost and production 110 -->
-        <th width="152px"><a href="{% url help_building_details b.tribe.name b.name %}" title="{{ b.displayname }}" name="{{ b.name }}">{{b.displayname|title }}</a></th>
-        <th colspan="2">Description</th>
-        <th>Build cost</th>
-        <th>Produces</th>
-      {% endif %}
-
-      {% if b.has_build_cost and not b.has_outputs and b.has_stored_wares %}
-            <!-- With build cost and stored wares 101 -->
-        <th width="152px"><a href="{% url help_building_details b.tribe.name b.name %}" title="{{ b.displayname }}" name="{{ b.name }}">{{b.displayname|title }}</a></th>
-        <th colspan="2">Description</th>
-        <th>Build cost</th>
-        <th>Stores</th>
-      {% endif %}
-
-      {% if not b.has_build_cost and b.has_outputs and b.has_stored_wares %}
-            <!-- With production and stored wares 011 -->
-        <th width="152px"><a href="{% url help_building_details b.tribe.name b.name %}" title="{{ b.displayname }}" name="{{ b.name }}">{{b.displayname|title }}</a></th>
-        <th colspan="2">Description</th>
-        <th>Produces</th>
-        <th>Stores</th>
-      {% endif %}
-
-      {% if b.has_build_cost and not b.has_outputs and not b.has_stored_wares %}
-            <!-- With build cost 100 -->
-        <th width="152px"><a href="{% url help_building_details b.tribe.name b.name %}" title="{{ b.displayname }}" name="{{ b.name }}">{{b.displayname|title }}</a></th>
-        <th colspan="3">Description</th>
-        <th>Build cost</th>
-      {% endif %}
-
-      {% if not b.has_build_cost and b.has_outputs and not b.has_stored_wares %}
-            <!-- With production 010 -->
-        <th width="152px"><a href="{% url help_building_details b.tribe.name b.name %}" title="{{ b.displayname }}" name="{{ b.name }}">{{b.displayname|title }}</a></th>
-        <th colspan="3">Description</th>
-        <th>Produces</th>
-      {% endif %}
-
-      {% if not b.has_build_cost and b.has_outputs and not b.has_stored_wares %}
-            <!-- With stored wares 001 -->
-        <th width="152px"><a href="{% url help_building_details b.tribe.name b.name %}" title="{{ b.displayname }}" name="{{ b.name }}">{{b.displayname|title }}</a></th>
-        <th colspan="3">Description</th>
-        <th>Stores</th>
-      {% endif %}
-
-      {% if not b.has_outputs and not b.has_build_cost and not b.has_stored_wares %}
-            <!-- For headquaters 000 -->
-        <th width="152px"><a href="{% url help_building_details b.tribe.name b.name %}" title="{{ b.displayname }}" name="{{ b.name }}">{{b.displayname|title }}</a></th>
-        <th colspan="4">Description</th>
-      {% endif %}
-    </tr>
-
-      <!-- Content -->
-    <tr class="odd">
-
-      {% if b.has_build_cost and b.has_outputs and b.has_stored_wares %}
-            <!-- With build cost and production and stored wares 111 -->
-        <td><a href="{% url help_building_details b.tribe.name b.name %}" title="{{ b.displayname }}"><img alt="{{b.displayname}}" src="{{ b.image_url }}" /></a></td>
-        <td>{{ b.help }}</td>
-        <td>
-          {% for costs in b.get_build_cost %}
-              {% for w in costs %}
-              <a href="{% url help_ware_details w.tribe.name w.name %}" title="{{w.displayname}}"><img src="{{ w.image_url }}" alt="{{ w.name }}" /></a>
-              {% endfor %}
-            <br />
-          {%endfor%}
-        </td> 
-        <td>
-          {% if b.produces and not b.trains %}
-            {% for w in b.get_ware_outputs %}
-            <a href="{% url help_ware_details w.tribe.name w.name %}" title="{{w.displayname}}"><img src="{{ w.image_url }}" alt="{{ w.name }}" /></a>
-            {%endfor%}
-          {% endif %}
-          {% if b.trains and not b.produces %}
-            {% for wor in b.get_worker_outputs %}
-            <img src="{{ wor.image_url }}" alt="{{ wor.name }}" />
-            {%endfor%}
-          {% endif %}
-        </td>
-        <td>
-          {% for costs in b.get_stored_wares %}
-              {% for w in costs %}
-              <a href="{% url help_ware_details w.tribe.name w.name %}" title="{{w.displayname}}"><img src="{{ w.image_url }}" alt="{{ w.name }}" /></a>
-              {% endfor %}
-            <br />
-          {%endfor%}
-        </td> 
-      {% endif %}
-
-      {% if b.has_build_cost and b.has_outputs and not b.has_stored_wares %}
-            <!-- With build cost and production 110 -->
-        <td><a href="{% url help_building_details b.tribe.name b.name %}" title="{{ b.displayname }}"><img alt="{{b.displayname}}" src="{{ b.image_url }}" /></a></td>
-        <td colspan="2">{{ b.help }}</td>
-        <td>
-          {% for costs in b.get_build_cost %}
-              {% for w in costs %}
-              <a href="{% url help_ware_details w.tribe.name w.name %}" title="{{w.displayname}}"><img src="{{ w.image_url }}" alt="{{ w.name }}" /></a>
-              {% endfor %}
-            <br />
-          {%endfor%}
-        </td> 
-        <td>
-          {% if b.produces and not b.trains %}
-            {% for w in b.get_ware_outputs %}
-            <a href="{% url help_ware_details w.tribe.name w.name %}" title="{{w.displayname}}"><img src="{{ w.image_url }}" alt="{{ w.name }}" /></a>
-            {%endfor%}
-          {% endif %}
-          {% if b.trains and not b.produces %}
-            {% for wor in b.get_worker_outputs %}
-            <img src="{{ wor.image_url }}" alt="{{ wor.name }}" />
-            {%endfor%}
-          {% endif %}
-        </td>
-      {% endif %}
-
-      {% if b.has_build_cost and not b.has_outputs and b.has_stored_wares%}
-            <!-- With build cost and stored wares 101 -->
-        <td><a href="{% url help_building_details b.tribe.name b.name %}" title="{{ b.displayname }}"><img alt="{{b.displayname}}" src="{{ b.image_url }}" /></a></td>
-        <td colspan="2">{{ b.help }}</td>
-        <td>
-          {% for costs in b.get_build_cost %}
-              {% for w in costs %}
-              <a href="{% url help_ware_details w.tribe.name w.name %}" title="{{w.displayname}}"><img src="{{ w.image_url }}" alt="{{ w.name }}" /></a>
-              {% endfor %}
-            <br />
-          {%endfor%}
-        </td> 
-        <td>
-          {% for costs in b.get_stored_wares %}
-              {% for w in costs %}
-              <a href="{% url help_ware_details w.tribe.name w.name %}" title="{{w.displayname}}"><img src="{{ w.image_url }}" alt="{{ w.name }}" /></a>
-              {% endfor %}
-            <br />
-          {%endfor%}
-        </td> 
-      {% endif %}
-
-      {% if not b.has_build_cost and b.has_outputs and b.has_stored_wares %}
-            <!-- With production and stored wares 011 -->
-        <td><a href="{% url help_building_details b.tribe.name b.name %}" title="{{ b.displayname }}"><img alt="{{b.displayname}}" src="{{ b.image_url }}" /></a></td>
-        <td colspan="2">{{ b.help }}</td>
-        <td>
-          {% if b.produces and not b.trains %}
-            {% for w in b.get_ware_outputs %}
-            <a href="{% url help_ware_details w.tribe.name w.name %}" title="{{w.displayname}}"><img src="{{ w.image_url }}" alt="{{ w.name }}" /></a>
-            {%endfor%}
-          {% endif %}
-          {% if b.trains and not b.produces %}
-            {% for wor in b.get_worker_outputs %}
-            <img src="{{ wor.image_url }}" alt="{{ wor.name }}" />
-            {%endfor%}
-          {% endif %}
-        </td>
-        <td>
-          {% for costs in b.get_stored_wares %}
-              {% for w in costs %}
-              <a href="{% url help_ware_details w.tribe.name w.name %}" title="{{w.displayname}}"><img src="{{ w.image_url }}" alt="{{ w.name }}" /></a>
-              {% endfor %}
-            <br />
-          {%endfor%}
-        </td> 
-      {% endif %}
-
-      {% if b.has_build_cost and not b.has_outputs and not b.has_stored_wares %}
-            <!-- With build cost 100 -->
-        <td><a href="{% url help_building_details b.tribe.name b.name %}" title="{{ b.displayname }}"><img alt="{{b.displayname}}" src="{{ b.image_url }}" /></a></td>
-        <td colspan="3">{{ b.help }}</td>
-        <td>
-          {% for costs in b.get_build_cost %}
-              {% for w in costs %}
-              <a href="{% url help_ware_details w.tribe.name w.name %}" title="{{w.displayname}}"><img src="{{ w.image_url }}" alt="{{ w.name }}" /></a>
-              {% endfor %}
-            <br />
-          {%endfor%}
-        </td> 
-      {% endif %}
-
-      {% if not b.has_build_cost and b.has_outputs and not b.has_stored_wares %}
-            <!-- With production 010 -->
-        <td><a href="{% url help_building_details b.tribe.name b.name %}" title="{{ b.displayname }}"><img alt="{{b.displayname}}" src="{{ b.image_url }}" /></a></td>
-        <td colspan="3">{{ b.help }}</td>
-        <td>
-          {% if b.produces and not b.trains %}
-            {% for w in b.get_ware_outputs %}
-            <a href="{% url help_ware_details w.tribe.name w.name %}" title="{{w.displayname}}"><img src="{{ w.image_url }}" alt="{{ w.name }}" /></a>
-            {%endfor%}
-          {% endif %}
-          {% if b.trains and not b.produces %}
-            {% for wor in b.get_worker_outputs %}
-            <img src="{{ wor.image_url }}" alt="{{ wor.name }}" />
-            {%endfor%}
-          {% endif %}
-        </td>
-      {% endif %}
-
-      {% if not b.has_build_cost and not b.has_outputs and b.has_stored_wares %}
-            <!-- With stored wares 001 -->
-        <td><a href="{% url help_building_details b.tribe.name b.name %}" title="{{ b.displayname }}"><img alt="{{b.displayname}}" src="{{ b.image_url }}" /></a></td>
-        <td colspan="3">{{ b.help }}</td>
-        <td>
-          {% for costs in b.get_stored_wares %}
-              {% for w in costs %}
-              <a href="{% url help_ware_details w.tribe.name w.name %}" title="{{w.displayname}}"><img src="{{ w.image_url }}" alt="{{ w.name }}" /></a>
-              {% endfor %}
-            <br />
-          {%endfor%}
-        </td> 
-      {% endif %}
-
-      {% if not b.has_build_cost and not b.has_outputs and not b.has_stored_wares %}
-            <!-- For headquaters 000 -->
-        <td><a href="{% url help_building_details b.tribe.name b.name %}" title="{{b.displayname}}"><img alt="{{b.displayname}}" src="{{ b.image_url }}" /></a></td>
-        <td colspan="4">{{ b.help }}</td>
-      {% endif %}
-    </tr>
-

=== removed file 'online_help/templates/inlines/display_ware.html'
--- online_help/templates/inlines/display_ware.html	2010-11-01 19:02:28 +0000
+++ online_help/templates/inlines/display_ware.html	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-{% comment %}
-   vim:ft=htmldjango
-{% endcomment %}
-
-   <tr class="odd">
-      <td><a href="{% url help_ware_details ware.tribe.name ware.name %}" title="{{ ware.displayname }}"><img src="{{ ware.image_url }}"  alt="{{ ware.name }}" /></a></td>
-      <td><a href="{% url help_ware_details ware.tribe.name ware.name %}" title="{{ ware.displayname }}" name="{{ ware.name }}">{{ ware.displayname }}</a></td>
-      <td>{{ ware.help }}</td> 
-   </tr>
-

=== removed file 'online_help/templates/inlines/display_worker.html'
--- online_help/templates/inlines/display_worker.html	2010-11-06 19:35:10 +0000
+++ online_help/templates/inlines/display_worker.html	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-{% comment %}
-   vim:ft=htmldjango
-{% endcomment %}
-
-   <tr class="odd">
-      <td><img src="{{ worker.image_url }}"  alt="{{ worker.name }}" /></td>
-      <td><a name="{{ worker.name }}" href="{{worker.name}}/">{{ worker.displayname }}</a></td>
-      <td>{{ worker.help }}</td> 
-   </tr>
-

=== modified file 'pybb/forms.py'
--- pybb/forms.py	2011-08-24 13:09:49 +0000
+++ pybb/forms.py	2012-07-11 17:31:35 +0000
@@ -27,7 +27,10 @@
         self.ip = kwargs.pop('ip', None)
         super(AddPostForm, self).__init__(*args, **kwargs)
 
-        self.fields.keyOrder = ['name', 'body', 'markup', 'attachment']
+        self.fields.keyOrder = ['name', 
+                                'body', 
+                                'markup', 
+                                'attachment']
 
         if self.topic:
             self.fields['name'].widget = forms.HiddenInput()
@@ -49,7 +52,7 @@
 
     def save(self, *args, **kwargs):
         if self.forum:
-	    topic_is_new = True
+            topic_is_new = True
             topic = Topic(forum=self.forum,
                           user=self.user,
                           name=self.cleaned_data['name'])
@@ -91,7 +94,7 @@
 class EditPostForm(forms.ModelForm):
     class Meta:
         model = Post
-        fields = ['body']
+        fields = ['body', 'markup']
 
     def save(self, *args, **kwargs):
         post = super(EditPostForm, self).save(commit=False)

=== modified file 'pybb/templatetags/pybb_extras.py'
--- pybb/templatetags/pybb_extras.py	2011-09-11 18:15:47 +0000
+++ pybb/templatetags/pybb_extras.py	2012-07-11 17:31:35 +0000
@@ -90,7 +90,7 @@
     return {
         'posts': answer,
         'user': context['user'],
-	}
+        }
 
 @register.simple_tag
 def pybb_link(object, anchor=u''):

=== modified file 'pybb/urls.py'
--- pybb/urls.py	2010-06-08 19:08:52 +0000
+++ pybb/urls.py	2012-07-11 17:31:35 +0000
@@ -11,7 +11,7 @@
 urlpatterns = patterns('',
     # Misc
     url('^$', views.index, name='pybb_index'),
-    # url('^category/(?P<category_id>\d+)/$', views.show_category, name='pybb_category'),
+    url('^category/(?P<category_id>\d+)/$', views.show_category, name='pybb_category'),
     url('^forum/(?P<forum_id>\d+)/$', views.show_forum, name='pybb_forum'),