]> git.wh0rd.org - tt-rss.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorRichard Beales <rich@richbeales.net>
Thu, 21 Mar 2013 07:04:54 +0000 (07:04 +0000)
committerRichard Beales <rich@richbeales.net>
Thu, 21 Mar 2013 07:04:54 +0000 (07:04 +0000)
1  2 
index.php

diff --combined index.php
index 8cb73777c811a9b41dc3d249270fba67165270a7,4cbd756a39af09de856c00cd7c934485ef47c2f7..fd99dcca5b6aa3d5afe0ed924d84717872fc734d
+++ b/index.php
@@@ -53,7 -53,7 +53,7 @@@
        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <html>
  <head>
 -      <title>Tiny Tiny RSS</title>
 +    <title><?php echo PAGE_TITLE ?></title>
  
        <?php echo stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?>
        <?php echo stylesheet_tag("tt-rss.css"); ?>
  <div id="header">
        <img id="net-alert" style="display : none"
                title="<?php echo __("Communication problem with server.") ?>"
-               src="<?php echo theme_image($link, 'images/alert.png') ?>"/>
+               src="images/alert.png"/>
  
        <img id="newVersionIcon" style="display:none" onclick="newVersionDlg()"
                width="13" height="13"
-               src="<?php echo theme_image($link, 'images/new_version.png') ?>"
+               src="images/new_version.png"
                title="<?php echo __('New version of Tiny Tiny RSS is available!') ?>"
                alt="new_version_icon"/>
  </div>
                        <option value="score"><?php echo __('Score') ?></option>
                </select>
  
-               <button dojoType="dijit.form.Button" name="update"
+               <!-- deprecated -->
+               <button dojoType="dijit.form.Button" name="update" style="display : none"
                        onclick="viewCurrentFeed()">
                        <?php echo __('Update') ?></button>
  
                        <button id="net-alert" dojoType="dijit.form.Button" style="display : none" disabled="true"
                                title="<?php echo __("Communication problem with server.") ?>">
                        <img
-                               src="<?php echo theme_image($link, 'images/alert.png') ?>" />
+                               src="images/alert.png" />
                        </button>
  
                        <button id="newVersionIcon" dojoType="dijit.form.Button" style="display : none">
                        <img onclick="newVersionDlg()"
-                               src="<?php echo theme_image($link, 'images/new_version.png') ?>"
+                               src="images/new_version.png"
                                title="<?php echo __('New version of Tiny Tiny RSS is available!') ?>" />
                        </button>