Update README and Shaarli's footer

 * remove version number display from main page
 * update project URL in footer, fixes https://github.com/shaarli/Shaarli/issues/89
 * update copyright notice in the footer
 * mention origins of the fork in README, fixes https://github.com/shaarli/Shaarli/issues/105
 * update License section in the README
 * remove screenshots as mediacru.sh is down

diff --git a/README.md b/README.md
index d07437836226bf9fe8055daefe89f2ce897c452b..6b5086f39ce5f88fd99124986b1ac73d52de1e81 100644 (file)
--- a/README.md
+++ b/README.md
@@ -41,12 +41,15 @@ It is designed to be personal (single-user), fast and handy.
  * You will be automatically notified by a discreet popup if a new version is available
  * **Shaarli is a bookmarking application, but you can use it for micro-blogging (like Twitter), a pastebin, an online notepad, a snippet repository, etc. See [Usage examples](https://github.com/shaarli/Shaarli/wiki#usage-examples)**
 
+
 ## Links
+
  * **[Wiki/documentation](https://github.com/shaarli/Shaarli/wiki)**
  * [Bugs/Feature requests/Discussion](https://github.com/shaarli/Shaarli/issues/)
 
 
 ## Installing
+
 Shaarli requires php 5.1
 
  * Download the latest stable release from https://github.com/shaarli/Shaarli/releases
@@ -56,21 +59,22 @@ Shaarli requires php 5.1
 
 _To get the development version, download https://github.com/shaarli/Shaarli/archive/master.zip or `git clone https://github.com/shaarli/Shaarli`_
 
+
 ## Upgrading
+
 Delete all files and directories except the `data` directory, then unzip the new version of Shaarli.  
 You will not lose your links and you will not have to reconfigure it.
 
 
-## Screenshots
-
-[![](https://cdn.mediacru.sh/AjZc6-emICeO.png)](https://cdn.mediacru.sh/kE8SyD-PvGuC.png)  [![](https://cdn.mediacru.sh/MfC-DzklMYs2.png)](https://cdn.mediacru.sh/iqTvO1-yP9pU.png) [![](https://cdn.mediacru.sh/dxmXskaubYcg.png)](https://cdn.mediacru.sh/mMoi31f94wdL.png) [![](https://cdn.mediacru.sh/-ptB2veFivBp.png)](https://cdn.mediacru.sh/GcoZPZmCZ-DR.png) [![](https://cdn.mediacru.sh/QmRdTAr8x427.png)](https://cdn.mediacru.sh/TDDujpMWT31q.png)
 
 ## About
 
-Original Project page: http://sebsauvage.net/wiki/doku.php?id=php:shaarli  
-Shaarli is developed by [Sébastien SAUVAGE](http://sebsauvage.net) and [contributors](COPYING).
+This friendly fork is maintained by the community at https://github.com/shaarli/Shaarli
 
-Shaarli is [Free Software](https://en.wikipedia.org/wiki/Free_software) distributed under the [zlib/libpng License](http://www.gzip.org/zlib/zlib_license.html)
+This is a community fork of the original [Shaarli](https://github.com/sebsauvage/Shaarli/) project by [sebsauvage](http://sebsauvage.net/). The original project is currently unmaintained, and the developer [has informed us](https://github.com/sebsauvage/Shaarli/issues/191) that he would have no time to work on Shaarli in the near future. The Shaarli community has carried on the work to provide [many patches](https://github.com/shaarli/Shaarli/compare/sebsauvage:master...master) for [bug fixes and enhancements](https://github.com/shaarli/Shaarli/issues?q=is%3Aclosed+) in this repository, and will keep maintaining the project for the foreseeable future, while keeping Shaarli simple and efficient. If you'd like to help, have a look at the current [issues](https://github.com/shaarli/Shaarli/issues) and [pull requests](https://github.com/shaarli/Shaarli/pulls) and feel free to report bugs and feature requests, propose solutions to existing problems and send us pull requests. 
 
-This friendly fork is maintained by the community at https://github.com/shaarli/Shaarli
+
+## License
+
+Shaarli is [Free Software](http://en.wikipedia.org/wiki/Free_software). See [COPYING](COPYING) for a detail of the contributors and licenses for each individual component.
 

diff --git a/tpl/page.footer.html b/tpl/page.footer.html
index e55a3cb471e0907046e653430cddd62c26abe054..448e9f8ea88549ee3b5f4d36032868c0a840293b 100644 (file)
--- a/tpl/page.footer.html
+++ b/tpl/page.footer.html
@@ -1,8 +1,8 @@
 <div id="footer">
-    <b><a href="http://sebsauvage.net/wiki/doku.php?id=php:shaarli">Shaarli {$version|htmlspecialchars}</a></b> - The personal, minimalist, super-fast, no-database delicious clone. By <a href="http://sebsauvage.net" target="_blank">sebsauvage.net</a>. Theme by <a href="http://blog.idleman.fr" target="_blank">idleman.fr</a>.
+    <b><a href="https://github.com/shaarli/Shaarli">Shaarli</a></b> - The personal, minimalist, super-fast, no-database delicious clone by the <a href="https://github.com/shaarli/Shaarli">Shaarli</a> community.
 </div>
 {if="$newversion"}
-    <div id="newversion"><span id="version_id">&#x25CF;</span> Shaarli {$newversion|htmlspecialchars} is <a href="http://sebsauvage.net/wiki/doku.php?id=php:shaarli#download">available</a>.</div>
+    <div id="newversion"><span id="version_id">&#x25CF;</span> Shaarli {$newversion|htmlspecialchars} is <a href="https://github.com/shaarli/Shaarli/releases">available</a>.</div>
 {/if}
 {if="isLoggedIn()"}
 <script>function confirmDeleteLink() { var agree=confirm("Are you sure you want to delete this link ?"); if (agree) return true ; else return false ; }</script>