gnucash-htdocs master: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash-htdocs/commit/c41b93f7 (commit)
	 via  https://github.com/Gnucash/gnucash-htdocs/commit/27a2767a (commit)
	from  https://github.com/Gnucash/gnucash-htdocs/commit/5a126a5b (commit)



commit c41b93f7b47b3be5a5ce9bfa6ff56e0a4c3d4142
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Tue Aug 1 17:26:03 2017 +0200

    Fix /div count

diff --git a/index.phtml b/index.phtml
index 4a04023..6b3c9cd 100644
--- a/index.phtml
+++ b/index.phtml
@@ -75,7 +75,5 @@ include("externals/menu.phtml");
   <p><i><b><?php echo T_("Note that GnuCash for Android is not a port of the GnuCash program to Android.");?></b></i></p>
 </div>
 <!-- end Android app info -->
-</div>
-</div>
 
 <?php include("externals/footer.phtml"); ?>
diff --git a/news.phtml b/news.phtml
index 7b72d7c..57347fb 100644
--- a/news.phtml
+++ b/news.phtml
@@ -29,6 +29,5 @@ include("externals/menu.phtml");
       </div>
     </div>
   </div>
-</div>
 
-<?php include("externals/footer.phtml"); ?>
\ No newline at end of file
+<?php include("externals/footer.phtml"); ?>

commit 27a2767ae1a913342897439b664e3f4dd5b5d0e7
Author: David Thomas <sunfish62 at yahoo.com>
Date:   Fri Jul 28 14:53:00 2017 +0500

    Bug 783240 - Moving News onto its own page on website

diff --git a/externals/menu.phtml b/externals/menu.phtml
index 0dbb4ed..f17e0a3 100644
--- a/externals/menu.phtml
+++ b/externals/menu.phtml
@@ -6,7 +6,8 @@
     <b><?= T_("Information")?></b>
   </span>
   <ul>
-    <li><a href="<?=$home?>/index.phtml"><?= T_("About / News")?></a></li>
+    <li><a href="<?=$home?>/index.phtml"><?= T_("Home")?></a></li>
+    <li><a href="<?=$home?>/news.phtml"><?= T_("News")?></a></li>    
 <!--RSS atom feed link is on the top-right of the page   <li><a href="<?=$home?>/atom.php"><img src="<?=$home?>/images/icons/feed-icon-12x12.png" width="12" height="12" alt="[atom feed]" /> <?= T_("News Feed")?></a></li>-->
     <li><a href="<?=$home?>/features.phtml"><?=T_("Screenshots, Features")?></a></li>
     <li><a href="http://wiki.gnucash.org/wiki/Installation"><?=T_("Installation")?></a></li>
diff --git a/index.phtml b/index.phtml
index 75303c9..4a04023 100644
--- a/index.phtml
+++ b/index.phtml
@@ -75,29 +75,6 @@ include("externals/menu.phtml");
   <p><i><b><?php echo T_("Note that GnuCash for Android is not a port of the GnuCash program to Android.");?></b></i></p>
 </div>
 <!-- end Android app info -->
-
-
-<div id="newscontainer">
-<h1><?php echo T_("News"); ?></h1>
-
-<?php
-  echo("<!-- top_dir = $top_dir , home = $home -->\n");
-  # News will continue to be translated separately because 
-  # of the .txt format. 
-  # for english, the lang and en news path are identical
-  $en_newspath  =  $top_dir."/news";
-  $lang_newspath  =  $top_dir."/news/".$lang_dir;
-  $oldnews = false;
-  include("$top_dir/news/news-script.php");
-  emit_news($en_newspath, $lang_newspath, $oldnews);
-?>
-<div class="newsborder">
-<div class="newsheader"><img alt="news panel" src="<?=$top_dir;?>/images/icons/document.txt.gif" /> 
-<a href="oldnews.phtml"><?php echo T_("Older Announcements ...");?></a>
-
-</div><div class="newsinner">
-<?php echo T_("Click <a href=\"oldnews.phtml\">here</a> for older announcements...");?>
-</div></div>
 </div>
 </div>
 
diff --git a/news.phtml b/news.phtml
new file mode 100644
index 0000000..7b72d7c
--- /dev/null
+++ b/news.phtml
@@ -0,0 +1,34 @@
+<?php 
+include("emulate_globals_on.php");
+include("lang.php");
+$title = T_("News");
+include("externals/header.phtml");
+include("externals/menu.phtml");
+?>
+
+<div id="content">
+  <div id="newscontainer">
+    <h1><?php echo T_("GnuCash News"); ?></h1>
+    <?php
+      echo("<!-- top_dir = $top_dir , home = $home -->\n");
+      # News will continue to be translated separately because 
+      # of the .txt format. 
+      # for english, the lang and en news path are identical
+      $en_newspath  =  $top_dir."/news";
+      $lang_newspath  =  $top_dir."/news/".$lang_dir;
+      $oldnews = false;
+      include("$top_dir/news/news-script.php");
+      emit_news($en_newspath, $lang_newspath, $oldnews);
+    ?>
+    <div class="newsborder">
+      <div class="newsheader"><img alt="news panel" src="<?=$top_dir;?>/images/icons/document.txt.gif" /> 
+        <a href="oldnews.phtml"><?php echo T_("Older Announcements ...");?></a>
+      </div>
+      <div class="newsinner">
+        <?php echo T_("Click <a href=\"oldnews.phtml\">here</a> for older announcements...");?>
+      </div>
+    </div>
+  </div>
+</div>
+
+<?php include("externals/footer.phtml"); ?>
\ No newline at end of file



Summary of changes:
 externals/menu.phtml |  3 ++-
 index.phtml          | 25 -------------------------
 news.phtml           | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 26 deletions(-)
 create mode 100644 news.phtml