Commits

Anonymous committed 5f24f5c

Add current WineHQ logo, background, and icon.

The output is still rough, but some initial
changes have also been made to the CSS and
MoinMoin files.

Comments (0)

Files changed (8)

favicon.ico

Old
Old image
New
New image

logo.png

Removed
Old image

logo_img.png

Added
New image

logo_text.png

Added
New image
     # Wiki logo. You can use an image, text or both. [Unicode]
     # For no logo or text, use '' - the default is to show the sitename.
     # See also url_prefix setting below!
-    logo_string = u'<img src="/logo.png" width="230" height="99" border="0" alt="Wine Wiki">'
+    logo_string = u'<img src="%s/logo_img.png" alt="WineHQ Logo Image">,<img src="%s/logo_text.png" alt="WineHQ Logo Text">' % (url_prefix_static, url_prefix_static)
 
     # name of entry page / front page [Unicode], choose one of those:
 

winehq/css/screen.css

 */
 
 /* content styles */
-html { 
-	background-color: #E2E2E2;
-}
-
 body {
-        background-color: #E2E2E2;
-	margin: 0px;
-	padding: 0px;
-	border: 0px;
-        font-family: "bitstream vera sans", "verdana", "arial", "helvetica", sans-serif;
-        font-size: 12px;
+    background-color: #000000;
+    color: #000000;
+    background-image: url('../img/bg.jpg');
+    background-repeat: no-repeat;
+    font-family: "bitstream vera sans", "verdana", "arial", "helvetica", sans-serif;
+    margin: 0;
+    font-size: 10pt;
 }
 
 /* Link Colors */
 
 
 .footnotes div {
-	width: 5em;
-	border-top: 1px solid #e5e5e5;
+    width: 5em;
+    border-top: 1px solid #e5e5e5;
 }
 
 
 }
 
 /* user interface styles */
-
-#header {
-    background: #e5e5e5;
-}
-
 #logo {
     margin: 0;
     margin-bottom: 1px;
 }
 
 #logo a {
-    color: black;  
+    color: black;
     text-decoration: none;
 }
 
 
 #searchform form div {
     display: block;
-    
+
 }
 
 #searchinput {
 }
 
 #contentwell table {
-	padding-right: 40px;
+    padding-right: 40px;
 }
 
 #contentwell {
-	margin: 0px;
-	padding: 0px;
-	border: 0;
+    margin: 0px;
+    padding: 0px;
+    border: 0;
 }
 
 #sidewell {
-	margin: 0px;
-	padding: 0px;
-	border: 0;
-	width: 160px;
-	vertical-align: top;
+    margin: 0px;
+    padding: 0px;
+    border: 0;
+    width: 160px;
+    vertical-align: top;
 }
 
 #sidewell td {
-	padding: 0px;
+    padding: 0px;
 }
 
 #pagewell td {
-	padding: 0px;
-	border: none;
+    padding: 0px;
+    border: none;
 }
 
 #pagewell {
-	margin: 0px;
-	padding: 0px;
-	border: 0;
-	width: 100%;
-	vertical-align: top;
+    margin: 0px;
+    padding: 0px;
+    border: 0;
+    width: 100%;
+    vertical-align: top;
 }
-	
+
 #pagebar {
-	margin: 0px 0px 0px 0px;
-        padding: 0px 4px 10px 4px;	
-        background: #e2e2e2;
-} 
+    margin: 0px 0px 0px 0px;
+        padding: 0px 4px 10px 4px;
+}
 
 #pagecontent {
         margin: 0px 6px 0px 6px;
 }
 
 #pagetitle  {
-	margin: 0px 0px 0px 0px;
+    margin: 0px 0px 0px 0px;
         height: 10px;
 }
 
-#pagetitle h1 { 
-	padding: 0em 0px;
-	margin: 0px;
-	font-size: 12px;
+#pagetitle h1 {
+    padding: 0em 0px;
+    margin: 0px;
+    font-size: 12px;
         font-weight: bold;
         text-align: center;
-	color: white;
-	background: #631818;
+    color: white;
+    background: #631818;
 }
 
 #pagetitle td {
-	padding: 0px;
-	margin: 0px;
-	border: 0px;
-	background: #601919;
+    padding: 0px;
+    margin: 0px;
+    border: 0px;
+    background: #601919;
 }
 
 
 #sidebar {
-	margin: 0px 0px 10px 0px ;
-	float: left;
-	clear: left;
-	width: 100%;
-        padding: 0;	
-	font-size: 1em;
+    margin: 0px 0px 10px 0px ;
+    float: left;
+    clear: left;
+    width: 100%;
+        padding: 0;
+    font-size: 1em;
 }
 
 .actionsmenu {
         width: 140px;
 }
 
-        
+
 .sidepanel {
-	margin: 0 0 8px 0;
-	width: 150px;
-}        
-          
+    margin: 0 0 8px 0;
+    width: 150px;
+}
+
 .sidecontent {
-	margin: 0 0 15px 0;
-	float: left ;
-	width: 143px;
+    margin: 0 0 15px 0;
+    float: left ;
+    width: 143px;
         background: #ffffff;
         border: 1px solid #631818;
         padding-bottom: 2px;
 }
 
 .sidetitle  {
-	float: left;
+    float: left;
         margin: 0px 0px 0px 0px;
-	background-color: #631818;
+    background-color: #631818;
         height: 10px;
  }
 
 .sidetitle img {
-	margin: 0px;
-	padding: 0px;
-	border: 0;
+    margin: 0px;
+    padding: 0px;
+    border: 0;
 }
 
 .sidetitle h1 {
-	padding: 0em;
-	margin: 0px;
-	font-size: 12px;
+    padding: 0em;
+    margin: 0px;
+    font-size: 12px;
         font-weight: bold;
-	color: white;
-	background: #631818; 
-	text-align: left;
+    color: white;
+    background: #631818;
+    text-align: left;
 }
 
 /*.sidetitle table {
-	padding: 0px;
-	margin: 0px;
-	border: none;
-	border-collapse: 0;
+    padding: 0px;
+    margin: 0px;
+    border: none;
+    border-collapse: 0;
         background: black;
-        
+
 }
 .sidetitle tr {
-	padding: 0px;
-	margin: 0px;
-	border: 0px;
+    padding: 0px;
+    margin: 0px;
+    border: 0px;
 }
 */
 
 .sidetitle td { padding: 0px;
-	margin: 0px;
-	border: 0;
+    margin: 0px;
+    border: 0;
 }
 
 .sidepanel h2 {
-	margin: 0;
-	padding: 0.2em 10px;
-	font-size: 1em;
-	border: none;
-	color: black;
-	background: #ffffff;
+    margin: 0;
+    padding: 0.2em 10px;
+    font-size: 1em;
+    border: none;
+    color: black;
+    background: #ffffff;
 }
 
 .sidepanel ul {
-	list-style-type: none;
-	margin: 0;
-	padding: 0;
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
 }
 
 .sidepanel li {
-	margin: 0;
-	padding: 1.5px 10px;
-	background: #ffffff;
-	font-size: 10px;
-	line-height: 2em;
+    margin: 0;
+    padding: 1.5px 10px;
+    background: #ffffff;
+    font-size: 10px;
+    line-height: 2em;
 
 }
 
 .sidepanel li form {
-	margin: 0;
+    margin: 0;
 }
 
 .sidepanel a {
-	color: #000000;
+    color: #000000;
         text-decoration: underline;
         font-size: 10px;
-	}
+    }
 
 .sidepanel a:hover {
         color: #ff6563;
-	text-decoration: underline;
+    text-decoration: underline;
 }
 
 #navibar li.current {
-	border: none;
-	background: #ffffff;
+    border: none;
+    background: #ffffff;
 }
 
-#editbar {    
+#editbar {
         background: #ffffff;
 }
 
 #credits, #version, #timings{
-	margin: 0px;
-	width: 150px;
-	padding: 0;
-	list-style-type: none;
-	text-align: center;
-	font-size: 0.88em;
-	color: gray;
-	float: left;
+    margin: 0px;
+    width: 150px;
+    padding: 0;
+    list-style-type: none;
+    text-align: center;
+    font-size: 0.88em;
+    color: gray;
+    float: left;
 }
 
 
 #message {
         margin: 0px 6px 10px 6px;
-	background-color: #cfb5b5;
-	border: 1px solid #631818;
+    background-color: #cfb5b5;
+    border: 1px solid #631818;
 }
 
 #message p{
-	margin: 5px 0;
-	padding: 0;
-	font-weight: bold;
+    margin: 5px 0;
+    padding: 0;
+    font-weight: bold;
 }
 
 #message span.buttons {
-	font-weight: normal;
+    font-weight: normal;
 }
 
 form.dialog {
 }
 
 #pagebottom {
-	clear: both;
+    clear: both;
 }
 
 #preview {
-	border: 2px solid #e5e5e5;
-	padding: .5em;
-	background: url(../img/draft.png);
+    border: 2px solid #e5e5e5;
+    padding: .5em;
+    background: url(../img/draft.png);
 }
 
 .diff {
-	width:99%;
+    width:99%;
 }
 
 .diff-title {
-	background-color: #C0C0C0;
+    background-color: #C0C0C0;
 }
 
 .diff-added {
-	background-color: #E0FFE0;
-	vertical-align: sub;
+    background-color: #E0FFE0;
+    vertical-align: sub;
 }
 
 .diff-removed {
-	background-color: #FFFFE0;
-	vertical-align: sub;
+    background-color: #FFFFE0;
+    vertical-align: sub;
 }
 
 .diff-added span {
-	background-color: #80FF80;
+    background-color: #80FF80;
 }
 
 .diff-removed span {
-	background-color: #FFFF80;
+    background-color: #FFFF80;
 }
 
 .searchresult dd span {
-	font-weight: bold;
+    font-weight: bold;
 }
 

winehq/img/bg.jpg

Added
New image
 
     name = "winehq"
 
+    def logo(self):
+        """ Assemble logo with link to front page
+
+        The logo contain an image and or text or any html markup the
+        admin inserted in the config file. This overloaded version
+        checks for multiple tags in the config file and builds a logo
+        from them.
+
+        @rtype: unicode
+        @return: logo html
+        """
+        html = u''
+        if not self.cfg.logo_string:
+            return html
+
+        page = wikiutil.getFrontPage(self.request)
+        logo_parts = self.cfg.logo_string.split(',')
+
+        if len(logo_parts) is 2:
+            logo0 = page.link_to_raw(self.request, logo_parts[0])
+            logo1 = page.link_to_raw(self.request, logo_parts[1])
+            html += u'''<div id="logo_image" class="pos">%s</div>''' % logo0
+            html += u'''<div id="logo_text" class="pos">%s</div>''' % logo1
+        else:
+            logo = page.link_to_raw(self.request, logo_parts[0])
+            html += u'''<div id="logo">%s</div>''' % logo
+
+        return html
+
     def title(self, d):
         """ Assemble the title
 
                  _('Show Changes', formatted=False)))
         add(link(request, quotedname + '?action=info',
                  _('Get Info', formatted=False)))
-        add(self.subscribeLink(page))
+        add(link(request, quotedname + '?action=subscribe',
+                 _('Subscribe', formatted=False)))
 
         #    'SpellCheck': _('Check Spelling', formatted=False), # rename action!
         #    'LikePages': _('Show Like Pages', formatted=False),