Replaced orange feed/rss image by the blue one from our iconset, added file icon...

Had to fool around with the css for the banner again, in order to do so.

diff --git a/webcit/feed_generator.c b/webcit/feed_generator.c
index 40ee30f7c33813cddf01026d2a5ce530f88d90c4..c94013fc56d596140311e1168c35afbccc9c3e00 100644 (file)
--- a/webcit/feed_generator.c
+++ b/webcit/feed_generator.c
@@ -276,7 +276,7 @@ void tmplput_rssbutton(StrBuf *Target, WCTemplputParams *TP)
        CtdlEncodeBase64(encoded_link, feed_link, strlen(feed_link), 0);
 
        StrBufAppendPrintf(Target, "<a type=\"application/rss+xml\" href=\"/B64%s\">", encoded_link);
-       StrBufAppendPrintf(Target, "<img border=\"0\" src=\"static/rss_16x.png\" alt=\"RSS\">");
+       StrBufAppendPrintf(Target, "<img src=\"static/webcit_icons/essen/16x16/rss.png\" alt=\"RSS\">");
        StrBufAppendPrintf(Target, "</a>");
 }
 

diff --git a/webcit/static/styles/banner.css b/webcit/static/styles/banner.css
index bbeb9513e10fb3c1c59a639f036602afb5cfd2f7..5cafc22bcdcf794462234172c8e71d7cdfd051c6 100644 (file)
--- a/webcit/static/styles/banner.css
+++ b/webcit/static/styles/banner.css
@@ -41,14 +41,29 @@
 
 #banner .banner {}
 
-#banner .banner img {
+/* style for the rooom picture */
+#banner td img {
+       padding: 0;
+       margin: 0.5em;
+       max-height: 64px;
        float: left;
-       margin: 0 0.3em 1em 0;
 }
 
-#banner h1, #banner h2, #banner .banner p {
-       margin: 2px;
+#banner h1, #banner h2 {
+       padding: 0;
+       margin: 0;
+}
+
+#banner .banner p {
        padding: 0;
+       margin: 0;
+}
+
+/* style for the feed and file picture */
+#banner .banner td * img {
+       clear: both;
+       padding: 0;
+       margin: 0 0.3em;
 }
 
 #banner .infos{ margin: 0.5em }
@@ -93,6 +108,11 @@
        margin-right: 2px;
 }
 
+#nummsgs, #numfiles { 
+       font-size: 75%;
+       margin-left: 0.5em;
+}
+
 #selectpage.hidden { display: none !important }
 
 

diff --git a/webcit/static/styles/webcit.css b/webcit/static/styles/webcit.css
index e922f9dd8f29966172deccfa0fb2bf0452efc1b5..a6b916eee5093776f5ee2c0e88ce7aa2a97462c4 100644 (file)
--- a/webcit/static/styles/webcit.css
+++ b/webcit/static/styles/webcit.css
@@ -35,8 +35,6 @@ html, body {
        font-size: 100%;
 }
 
-#nummsgs { font-size: 75% }
-
 #message_list_hdr table { font-size: 80% }
 
 .mailbox_summary { font-size: 80% }

diff --git a/webcit/static/t/room/edit/tab_feed.html b/webcit/static/t/room/edit/tab_feed.html
index 2b1d9cddf9c2e729a502f4a7585849677e415c05..99242fb74aa978f45f0dc5a3ee5b5d6bb20671bc 100644 (file)
--- a/webcit/static/t/room/edit/tab_feed.html
+++ b/webcit/static/t/room/edit/tab_feed.html
@@ -39,7 +39,7 @@
        <table class="altern" border="0" cellpadding="5">
                <tr class="even">
                        <th>
-                               <img src="static/rss_16x.png" width="16" height="16" alt=" " /> 
+                               <img src="static/webcit_icons/essen/16x16/rss.png" alt=" " /> 
                                <?_("Feed URL")>
                        </th>
                        <th></th>

diff --git a/webcit/static/t/roombanner.html b/webcit/static/t/roombanner.html
index 544ddf19ddaa79732f364512f72c02c33a520c0c..9aeaa7d67810710d5dc877f03a5b9b6a0d5476be 100644 (file)
--- a/webcit/static/t/roombanner.html
+++ b/webcit/static/t/roombanner.html
@@ -10,7 +10,7 @@
                        <?!("COND:ROOM:TYPE_IS", 8, #"VIEW_BBS")><p id="nummsgs"><?THISROOM:MSGS:NEW> <?_("new of")> <?THISROOM:MSGS:TOTAL> <?_("messages")></p><?!("X", 8)>
                        <?!("COND:ROOM:TYPE_IS", 11, #"VIEW_MAILBOX")><p id="nummsgs"><?THISROOM:MSGS:NEW> <?_("new of")> <?THISROOM:MSGS:TOTAL> <?_("messages")></p><?!("X", 11)>
                        <?!("COND:THISROOM:FLAG:QR", 9, #"QR_DIRECTORY")><?!("COND:THISROOM:FLAG:QR", 10, #"QR_VISDIR")>
-                               <p id="numfiles"><a href="do_template?template=files"><?THISROOM:FILES:N> <?THISROOM:FILES:STR></a></p>
+                               <p id="numfiles"><img src="/static/webcit_icons/essen/16x16/file.png" alt="File"><a href="do_template?template=files"><?THISROOM:FILES:N> <?THISROOM:FILES:STR></a></p>
                        <?!("X", 10)><?!("X", 9)>
                </td>
                <td><?=("readinfo")></td>