diff options
author | nodiscc <nodiscc@gmail.com> | 2014-12-17 07:47:43 +0100 |
---|---|---|
committer | nodiscc <nodiscc@gmail.com> | 2015-02-14 13:48:39 +0100 |
commit | e6ea0f9653937bcac38b6ae5b834c93e1e0fafe4 (patch) | |
tree | 34c34eaa276dab7de3ff8294b7762bfa79838bfa | |
parent | aa69403cfff6734243f74a14251afd775bacc11a (diff) | |
download | Shaarli-e6ea0f9653937bcac38b6ae5b834c93e1e0fafe4.tar.gz Shaarli-e6ea0f9653937bcac38b6ae5b834c93e1e0fafe4.tar.zst Shaarli-e6ea0f9653937bcac38b6ae5b834c93e1e0fafe4.zip |
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
-rw-r--r-- | README.md | 18 | ||||
-rw-r--r-- | tpl/page.footer.html | 4 |
2 files changed, 13 insertions, 9 deletions
@@ -41,12 +41,15 @@ It is designed to be personal (single-user), fast and handy. | |||
41 | * You will be automatically notified by a discreet popup if a new version is available | 41 | * You will be automatically notified by a discreet popup if a new version is available |
42 | * **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)** | 42 | * **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)** |
43 | 43 | ||
44 | |||
44 | ## Links | 45 | ## Links |
46 | |||
45 | * **[Wiki/documentation](https://github.com/shaarli/Shaarli/wiki)** | 47 | * **[Wiki/documentation](https://github.com/shaarli/Shaarli/wiki)** |
46 | * [Bugs/Feature requests/Discussion](https://github.com/shaarli/Shaarli/issues/) | 48 | * [Bugs/Feature requests/Discussion](https://github.com/shaarli/Shaarli/issues/) |
47 | 49 | ||
48 | 50 | ||
49 | ## Installing | 51 | ## Installing |
52 | |||
50 | Shaarli requires php 5.1 | 53 | Shaarli requires php 5.1 |
51 | 54 | ||
52 | * Download the latest stable release from https://github.com/shaarli/Shaarli/releases | 55 | * Download the latest stable release from https://github.com/shaarli/Shaarli/releases |
@@ -56,21 +59,22 @@ Shaarli requires php 5.1 | |||
56 | 59 | ||
57 | _To get the development version, download https://github.com/shaarli/Shaarli/archive/master.zip or `git clone https://github.com/shaarli/Shaarli`_ | 60 | _To get the development version, download https://github.com/shaarli/Shaarli/archive/master.zip or `git clone https://github.com/shaarli/Shaarli`_ |
58 | 61 | ||
62 | |||
59 | ## Upgrading | 63 | ## Upgrading |
64 | |||
60 | Delete all files and directories except the `data` directory, then unzip the new version of Shaarli. | 65 | Delete all files and directories except the `data` directory, then unzip the new version of Shaarli. |
61 | You will not lose your links and you will not have to reconfigure it. | 66 | You will not lose your links and you will not have to reconfigure it. |
62 | 67 | ||
63 | 68 | ||
64 | ## Screenshots | ||
65 | |||
66 | [![](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) | ||
67 | 69 | ||
68 | ## About | 70 | ## About |
69 | 71 | ||
70 | Original Project page: http://sebsauvage.net/wiki/doku.php?id=php:shaarli | 72 | This friendly fork is maintained by the community at https://github.com/shaarli/Shaarli |
71 | Shaarli is developed by [Sébastien SAUVAGE](http://sebsauvage.net) and [contributors](COPYING). | ||
72 | 73 | ||
73 | 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) | 74 | 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. |
74 | 75 | ||
75 | This friendly fork is maintained by the community at https://github.com/shaarli/Shaarli | 76 | |
77 | ## License | ||
78 | |||
79 | 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. | ||
76 | 80 | ||
diff --git a/tpl/page.footer.html b/tpl/page.footer.html index e55a3cb4..448e9f8e 100644 --- a/tpl/page.footer.html +++ b/tpl/page.footer.html | |||
@@ -1,8 +1,8 @@ | |||
1 | <div id="footer"> | 1 | <div id="footer"> |
2 | <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>. | 2 | <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. |
3 | </div> | 3 | </div> |
4 | {if="$newversion"} | 4 | {if="$newversion"} |
5 | <div id="newversion"><span id="version_id">●</span> Shaarli {$newversion|htmlspecialchars} is <a href="http://sebsauvage.net/wiki/doku.php?id=php:shaarli#download">available</a>.</div> | 5 | <div id="newversion"><span id="version_id">●</span> Shaarli {$newversion|htmlspecialchars} is <a href="https://github.com/shaarli/Shaarli/releases">available</a>.</div> |
6 | {/if} | 6 | {/if} |
7 | {if="isLoggedIn()"} | 7 | {if="isLoggedIn()"} |
8 | <script>function confirmDeleteLink() { var agree=confirm("Are you sure you want to delete this link ?"); if (agree) return true ; else return false ; }</script> | 8 | <script>function confirmDeleteLink() { var agree=confirm("Are you sure you want to delete this link ?"); if (agree) return true ; else return false ; }</script> |