[Koha-patches] [PATCH] Bug #1855

[Frederic Demians]

---
 .../prog/en/modules/tools/koha-news.tmpl           |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl
old mode 100644
new mode 100755
index 32b8c73..7dc8b0c
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl
@@ -51,7 +51,7 @@ Edit News Item<!-- TMPL_ELSE -->Add News Item<!-- /TMPL_IF --><!-- TMPL_ELSE -->
 			<fieldset class="rows">
 			<legend>OPAC and Koha News</legend>
            <ol> <li>
-            <label for="lang">Language</label>
+            <label for="lang">Display Location</label>
             <select id="lang" name="lang">
                 <option value="koha">Librarian interface</option>
                 <!-- TMPL_LOOP name="lang_list" -->
@@ -91,7 +91,8 @@ Edit News Item<!-- TMPL_ELSE -->Add News Item<!-- /TMPL_IF --><!-- TMPL_ELSE -->
                 <fieldset class="action"><input class="button" type="submit" value="Submit" /> <a class="cancel" href="/cgi-bin/koha/tools/koha-news.pl">Cancel</a></fieldset>
         </form>
     <!-- TMPL_ELSE -->
-        <form name="add_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl">
+        <div style="margin-bottom:5px;">
+        <form name="add_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl" >
             <label for="lang">Display Location:</label>
             <select name="lang" id="lang">
             <option value="">All</option>
@@ -107,16 +108,17 @@ Edit News Item<!-- TMPL_ELSE -->Add News Item<!-- /TMPL_IF --><!-- TMPL_ELSE -->
                 <!-- /TMPL_LOOP -->
             </select>
             <input type="submit" class="button" value="Filter" />
-            </form>
+        </form>
+        </div>
         <!-- TMPL_IF NAME="opac_news_count" -->
         <form name="del_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl" onsubmit="return confirm('Are you sure you want to delete the selected news?')">
                 <table id="newst">
                    <thead> <tr>
                         <th>&nbsp;</th>
-                        <th>Language</th>
+                        <th>Location</th>
                         <th>Number</th>
-                        <th>Creation Date</th>
-                        <th>Expiration Date</th>
+                        <th>Creation&nbsp;Date</th>
+                        <th>Expiration&nbsp;Date</th>
                         <th>Title</th>
                         <th>News</th>
                         <th>&nbsp;</th>
-- 
1.5.3.7