Skip to content

Commit

Permalink
Fix #1567. Add twitter button (#1573)
Browse files Browse the repository at this point in the history
backport #1567
  • Loading branch information
offtherailz authored Mar 16, 2017
1 parent 6362863 commit 4129238
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 8 deletions.
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/).

Expand Down Expand Up @@ -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.
Expand All @@ -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`

Expand Down
7 changes: 6 additions & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
@@ -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_.
Expand All @@ -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
-----------

Expand Down Expand Up @@ -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
* [Users Guide] TBD
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 6 additions & 2 deletions web/client/product/components/home/MailingLists.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down Expand Up @@ -84,8 +85,8 @@ var MailingLists = React.createClass({
</tbody>
</table>
</Col>
<Col sm={12} md={12}>
<table style={{padding: "5px", margin: "auto"}} cellSpacing="0">
<Col sm={12} md={6}>
<table style={{padding: "0", margin: "10px auto"}} cellSpacing="0">
<tbody>
<tr>
<td>
Expand All @@ -105,6 +106,9 @@ var MailingLists = React.createClass({
</tbody>
</table>
</Col>
<Col sm={12} md={6} style={{padding: "50px 10px"}}>
<Follow options={{size: 'large'}} username="mapstore2" />
</Col>
</Row>
</div>
);
Expand Down

0 comments on commit 4129238

Please sign in to comment.