[bodhi] 6 commits - bodhi/static bodhi/templates bodhi/tools

[Luke Macken]

bodhi/static/images/hardhat.png |binary
 bodhi/static/images/info.png    |binary
 bodhi/templates/welcome.kid     |   16 ++++++++++++++--
 bodhi/tools/client.py           |    8 +++++++-
 4 files changed, 21 insertions(+), 3 deletions(-)

New commits:
commit 7cfdc9297bf80fc0a9b65078da0ff0ed75afdd48
Merge: 91a0bdc... c51d5ef...
Author: Luke Macken 
Date:   Tue Aug 3 17:52:34 2010 -0400

Merge branch 'master' of git+ssh://git.fedorahosted.org/git/bodhi

commit 91a0bdc6a785875f671117709fe118fafba06b62
Author: Luke Macken 
Date:   Tue Aug 3 17:52:14 2010 -0400

Add links to the Bodhi and Proven Tester Guides on the front page

diff --git a/bodhi/static/images/hardhat.png b/bodhi/static/images/hardhat.png
new file mode 100644
index 0000000..39eff75
Binary files /dev/null and b/bodhi/static/images/hardhat.png differ
diff --git a/bodhi/static/images/info.png b/bodhi/static/images/info.png
new file mode 100644
index 0000000..751bd15
Binary files /dev/null and b/bodhi/static/images/info.png differ
diff --git a/bodhi/templates/welcome.kid b/bodhi/templates/welcome.kid
index 474d870..0ebed19 100644
--- a/bodhi/templates/welcome.kid
+++ b/bodhi/templates/welcome.kid
@@ -13,6 +13,8 @@

<script language="javascript">
         $(document).ready(function(){
+            $('#testingtip').Tooltip( { delay: 0, track: true, opacity: 0.85,  } );
+            $('#wikitip').Tooltip( { delay: 0, track: true, opacity: 0.85,  } );
             $('#bodhitip').Tooltip( { delay: 0, track: true, opacity: 0.85,  } );
             $('#wftip').Tooltip( { delay: 0, track: true, opacity: 0.85,  } );
             $('#clitip').Tooltip( { delay: 0, track: true, opacity: 0.85,  } );
@@ -31,8 +33,13 @@
                     <table>
                         <tr>
                             <td>
-                                <span id="bodhitip" title="Bodhi Project Homepage">
-                                    <a href="https://fedorahosted.org/bodhi"><img src="${tg.url('/static/images/bodhi-icon-36.png')}" border="0" height="36" width="36"/></a>
+                                <span id="wikitip" title="Bodhi Guide">
+                                    <a href="https://fedoraproject.org/wiki/Bodhi"><img src="${tg.url('/static/images/info.png')}" border="0" height="36" width="36"/></a>
+                                </span>
+                            </td>
+                            <td>
+                                <span id="testingtip" title="Proven Testers Guide">
+                                    <a href="https://fedoraproject.org/wiki/Proventester"><img src="${tg.url('/static/images/hardhat.png')}" border="0" height="36" width="36"/></a>
                                 </span>
                             </td>
                             <td>
@@ -52,6 +59,11 @@
                                 </span>
                             </td>
                             <td>
+                                <span id="bodhitip" title="Bodhi Project Homepage">
+                                    <a href="https://fedorahosted.org/bodhi"><img src="${tg.url('/static/images/bodhi-icon-36.png')}" border="0" height="36" width="36"/></a>
+                                </span>
+                            </td>
+                            <td>
                                 <span id="kojitip" title="Koji Buildsystem">
                                     <a href="http://koji.fedoraproject.org/koji/" class="list"><font size="6">麹</font></a>
                                 </span>

commit 7c23c600bfe6eb546862c8319b4cb5c4e38f3966
Merge: a1c80d1... f15c6c4...
Author: Luke Macken 
Date:   Tue Aug 3 16:25:07 2010 -0400

Merge branch 'master' of git+ssh://git.fedorahosted.org/git/bodhi

commit a1c80d12b8834e8160f9cc0bd472779dce69b0bb
Merge: fb4f9d3... 4710963...
Author: Luke Macken 
Date:   Tue Aug 3 16:24:18 2010 -0400

Merge branch 'master' of git+ssh://git.fedorahosted.org/git/bodhi

commit fb4f9d31148ad2f8d234c0ce0d159a9b2c9ce332
Merge: f06b8a0... 0d18035...
Author: Luke Macken 
Date:   Fri Jul 30 13:35:03 2010 -0400

Merge branch 'master' of git+ssh://git.fedorahosted.org/git/bodhi

commit f06b8a07fe19ef67fd922ee4432c8ff43b10df12
Author: Luke Macken 
Date:   Thu Jul 15 15:45:26 2010 -0400

Revert "Calling bodhi.util.load_config in our client breaks the logger (#303)"

This reverts commit 3676bc978f6b30c1c29bf63f33c6a928e172c620.

Now that we are print()ing our client output, this should no longer cause
    problems.  Plus, we need this code on our masher servers so the bodhi-client
    knows to send requests to 'localhost'

diff --git a/bodhi/tools/client.py b/bodhi/tools/client.py
index fb058b2..a56c370 100755
--- a/bodhi/tools/client.py
+++ b/bodhi/tools/client.py
@@ -29,7 +29,13 @@ from optparse import OptionParser
 from fedora.client import AuthError, ServerError
 from fedora.client.bodhi import BodhiClient

-BODHI_URL = 'https://admin.fedoraproject.org/updates/'
+try:
+    from turbogears import config
+    from bodhi.util import load_config
+    load_config()
+    BODHI_URL = config.get('bodhi_url', 'https://admin.fedoraproject.org/updates/')
+except:
+    BODHI_URL = 'https://admin.fedoraproject.org/updates/'

log = logging.getLogger(__name__)