diff --git a/README.md b/README.md index 215d8f94c9..0a7d9cb50e 100644 --- a/README.md +++ b/README.md @@ -2,14 +2,15 @@ [![Build Status](https://travis-ci.org/geosolutions-it/MapStore2.svg?branch=master)](https://travis-ci.org/geosolutions-it/MapStore2) [![Coverage Status](https://coveralls.io/repos/geosolutions-it/MapStore2/badge.svg?branch=master&service=github)](https://coveralls.io/github/geosolutions-it/MapStore2?branch=master) [![Codacy Badge](https://www.codacy.com/project/badge/1648d484427346e2877006dc287379b6)](https://www.codacy.com/app/simone-giannecchini/MapStore2) +[![Twitter URL](https://img.shields.io/twitter/url/https/twitter.com/fold_left.svg?style=social&label=Follow%20%40mapstore2)](https://twitter.com/mapstore2) MapStore 2 ========== MapStore 2 is a framework to build *web mapping* applications using standard mapping libraries, such as [OpenLayers 3](http://openlayers.org/) and [Leaflet](http://leafletjs.com/). -MapStore 2 has several example applications: +MapStore 2 has several example applications: * MapViewer is a simple viewer of preconfigured maps (optionally stored in a database using GeoStore) - * MapPublisher has been developed to create, save and share in a simple and intuitive way maps and mashups created selecting contents by server like OpenStreetMap, Google Maps, MapQuest or specific servers provided by your organization or third party. + * MapPublisher has been developed to create, save and share in a simple and intuitive way maps and mashups created selecting contents by server like OpenStreetMap, Google Maps, MapQuest or specific servers provided by your organization or third party. For more information check the [MapStore documentation](https://geosolutions-it.github.io/MapStore2/). @@ -45,7 +46,7 @@ Demo Instances We have the following instances: 1. a DEV instance, which can be accessed [here](http://dev.mapstore2.geo-solutions.it), where all the changes are deployed once they are published on the Master branch of our repo -2. a QA instance, which can be accessed [here](http://qa.mapstore2.geo-solutions.it), that becomes active 1 week before any release, during the hardening phase, and deploys the release branch whenever a fix is pushed onto it. +2. a QA instance, which can be accessed [here](http://qa.mapstore2.geo-solutions.it), that becomes active 1 week before any release, during the hardening phase, and deploys the release branch whenever a fix is pushed onto it. 3. a STABLE instance, which can be accessed [here](http://mapstore2.geo-solutions.it), that gets deployed on demand after each release. As a user you need to be aware of STABLE and DEV, QA is used internally before a release; for 1 Week it will diverge from STABLE as it is actually anticipating the next stable. @@ -60,7 +61,7 @@ Clone the repository with the --recursive option to automatically clone submodul Install NodeJS >= 4.6.1 , if needed, from [here](https://nodejs.org/en/download/releases/). -Update npm to 3.x, using: +Update npm to 3.x, using: `npm install -g npm@3` diff --git a/docs/index.md b/docs/index.md index 06b983e3cc..22a695e9f6 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,6 @@ + + ![MapStore Logo](https://github.com/geosolutions-it/MapStore2/blob/master/MapStore2.png?raw=true) **[MapStore](http://mapstore2.geo-solutions.it/)** is a framework to build _web mapping_ applications using standard mapping libraries, such as _OpenLayers 3_ and _Leaflet_. @@ -11,6 +13,9 @@ MapStore has several example applications: MapStore 2 is based on OpenLayers 3, Leaflet and ReactJS, and is licensed under the GPLv3 license. +[![Twitter URL](https://img.shields.io/twitter/url/https/twitter.com/fold_left.svg?style=social&label=Follow%20%40mapstore2)](https://twitter.com/mapstore2) + + Quick Start ----------- @@ -53,4 +58,4 @@ Use the default credentials (admin / admin) to login and start creating your map # Documentation * [Developers Guide](developer-guide/) - * [Users Guide] TBD \ No newline at end of file + * [Users Guide] TBD diff --git a/package.json b/package.json index b0e010e8b2..9d22f11080 100644 --- a/package.json +++ b/package.json @@ -124,16 +124,17 @@ "react-overlays": "0.6.3", "react-pdf": "1.6.1", "react-redux": "4.4.1", + "react-responsive": "1.1.3", "react-router": "2.5.2", "react-router-redux": "3.0.0", "react-select": "1.0.0-rc.1", - "react-responsive": "1.1.3", "react-selectize": "2.0.3", "react-share": "1.8.0", "react-sidebar": "2.3.0", "react-sortable-items": "https://github.com/geosolutions-it/react-sortable-items/tarball/react15", "react-spinkit": "2.1.1", "react-swipeable-views": "0.11.1", + "react-twitter-widgets": "1.2.0", "react-widgets": "3.4.6", "redux": "3.6.0", "redux-logger": "2.6.1", diff --git a/web/client/product/components/home/MailingLists.jsx b/web/client/product/components/home/MailingLists.jsx index f19ba206e7..c1507675be 100644 --- a/web/client/product/components/home/MailingLists.jsx +++ b/web/client/product/components/home/MailingLists.jsx @@ -11,6 +11,7 @@ var I18N = require('../../../components/I18N/I18N'); const googleGroups = require('../../assets/img/groups_logo_sm.gif'); const LinkedinGroup = require('../../assets/img/linkedin_group.png'); +const {Follow} = require('react-twitter-widgets'); var MailingLists = React.createClass({ @@ -84,8 +85,8 @@ var MailingLists = React.createClass({ - - + +
@@ -105,6 +106,9 @@ var MailingLists = React.createClass({
+ + + );