Skip to content

Commit

Permalink
Merge pull request #682 from simonseyock/rename-github-links
Browse files Browse the repository at this point in the history
Rename links to github repository and github pages
  • Loading branch information
simonseyock authored May 21, 2021
2 parents f4c4b25 + 833efa4 commit 95f8fc8
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 41 deletions.
12 changes: 6 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ directories are detected (end via `CTRL+C`).
to the source code are detected, the browser page is reloaded (end via
`CTRL+C`).
* `coveralls` is used by the continues integration platform
[Travis CI](https://travis-ci.org/geoext/geoext3) to upload coverage info to
[Coveralls.io](https://coveralls.io/github/geoext/geoext3)
[Travis CI](https://travis-ci.org/geoext/geoext) to upload coverage info to
[Coveralls.io](https://coveralls.io/github/geoext/geoext)
* `generate:example`generates a sample application in the examples folder. Use
this to start a new feature example for GeoExt3.
* `generate:docs` generates an API documentation that you can access in the
Expand Down Expand Up @@ -174,13 +174,13 @@ To generate a package you usually first create a Sencha `workspace` by issuing
$ sencha -sdk /path/to/ext-n.n.n generate workspace /path/to/workspace
```

Inside of the workspace clone the `geoext3` repository into the `packages`
Inside of the workspace clone the `geoext` repository into the `packages`
subfolder:

```
$ cd /path/to/workspace/packages
$ git clone https://github.com/geoext/geoext3.git GeoExt3
$ cd GeoExt3
$ git clone https://github.com/geoext/geoext.git geoext
$ cd geoext
```

Then you can issue
Expand Down Expand Up @@ -234,7 +234,7 @@ In the future we will most probably host the package on a remote resource so
that you can do:

```
sencha package repo add GeoExt http://geoext.github.io/geoext3/cmd/pkgs
sencha package repo add GeoExt http://geoext.github.io/geoext/cmd/pkgs
```

### Update the `geoext` package on geoext.github.io
Expand Down
52 changes: 26 additions & 26 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

JavaScript Toolkit for Rich Web Mapping Applications.

[![Build Status](https://travis-ci.org/geoext/geoext3.svg?branch=master)](https://travis-ci.org/geoext/geoext3)
[![Coverage Status](https://coveralls.io/repos/geoext/geoext3/badge.svg?branch=master&service=github)](https://coveralls.io/github/geoext/geoext3?branch=master)
[![dependencies Status](https://david-dm.org/geoext/geoext3/status.svg)](https://david-dm.org/geoext/geoext3)
[![devDependencies Status](https://david-dm.org/geoext/geoext3/dev-status.svg)](https://david-dm.org/geoext/geoext3?type=dev)
[![Build Status](https://travis-ci.org/geoext/geoext.svg?branch=master)](https://travis-ci.org/geoext/geoext)
[![Coverage Status](https://coveralls.io/repos/geoext/geoext/badge.svg?branch=master&service=github)](https://coveralls.io/github/geoext/geoext?branch=master)
[![dependencies Status](https://david-dm.org/geoext/geoext/status.svg)](https://david-dm.org/geoext/geoext)
[![devDependencies Status](https://david-dm.org/geoext/geoext/dev-status.svg)](https://david-dm.org/geoext/geoext?type=dev)

[![GeoExt logo](https://geoext.github.io/geoext3/website-resources/img/GeoExt-logo.png)](https://geoext.github.io/geoext3/)
[![GeoExt logo](https://geoext.github.io/geoext/website-resources/img/GeoExt-logo.png)](https://geoext.github.io/geoext/)

GeoExt is Open Source and enables building desktop-like GIS applications through the web. It is a JavaScript framework that combines the GIS functionality of OpenLayers with the user interface savvy of the ExtJS library provided by Sencha.

Expand All @@ -24,11 +24,11 @@ The current state of GeoExt is compatible with ExtJS 6.2.0 and OpenLayers 4.6.5.

## More information on GeoExt 3

Have a look at the official homepage: https://geoext.github.io/geoext3/
Have a look at the official homepage: https://geoext.github.io/geoext/

You will find examples, API documentation (with and without inherited functionality from ExtJS), links to mailinglists and more over there.

> What you see on https://geoext.github.io/geoext3/ are the contents of the `gh-pages`-branch. If you encounter anything that should be fixed, please issue a pull request against that branch and we will merge it as soon as possible.
> What you see on https://geoext.github.io/geoext/ are the contents of the `gh-pages`-branch. If you encounter anything that should be fixed, please issue a pull request against that branch and we will merge it as soon as possible.
## How to use GeoExt 3 inside your Sencha app

Expand All @@ -45,11 +45,11 @@ Else it will be the folder where you cloned the repository into.
"classpath": [
"app",
"${toolkit.name}/src",
"./lib/geoext3/src"
"./lib/geoext/src"
]
```

In the snippet above, `lib/geoext3` is a `git clone` of the GeoExt repo.
In the snippet above, `lib/geoext` is a `git clone` of the GeoExt repo.

GeoExt also offers components, which are only compatible with the classic
toolkit of ExtJS (e.g. `StateProvider` or `GeocoderCombo`).
Expand All @@ -60,8 +60,8 @@ In case you want to use them you also have to add the `classic` folder to the
"classpath": [
"app",
"${toolkit.name}/src",
"./lib/geoext3/src",
"./lib/geoext3/classic"
"./lib/geoext/src",
"./lib/geoext/classic"
]
```

Expand All @@ -71,23 +71,23 @@ To help with your first GeoExt 3 project, follow the instructions provided to bu

### Classic Toolkit

https://geoext.github.io/geoext3/master/examples/component/map.html
https://geoext.github.io/geoext/master/examples/component/map.html

* [Basic map component](https://geoext.github.io/geoext3/master/examples/component/map.html)
* [Overview component](https://geoext.github.io/geoext3/master/examples/component/overviewMap.html)
* [Basic TreePanel](https://geoext.github.io/geoext3/master/examples/tree/panel.html)
* [Legends in Treepanels](https://geoext.github.io/geoext3/master/examples/tree/tree-legend-simple.html)
* [Basic print with Mapfish v3](https://geoext.github.io/geoext3/master/examples/print/basic-mapfish.html)
* [Popup on a map component](https://geoext.github.io/geoext3/master/examples/popup/gx-popup.html)
* [FeatureGrid component](https://geoext.github.io/geoext3/master/examples/features/grid.html)
* [Interactively filtered heatmap](https://geoext.github.io/geoext3/master/examples/filtered-heatmap/filtered-heatmap.html)
* [FeatureRenderer component](https://geoext.github.io/geoext3/master/examples/renderer/renderer.html)
* [MapView form](https://geoext.github.io/geoext3/master/examples/mapviewform/mapviewform.html)
* [Basic map component](https://geoext.github.io/geoext/master/examples/component/map.html)
* [Overview component](https://geoext.github.io/geoext/master/examples/component/overviewMap.html)
* [Basic TreePanel](https://geoext.github.io/geoext/master/examples/tree/panel.html)
* [Legends in Treepanels](https://geoext.github.io/geoext/master/examples/tree/tree-legend-simple.html)
* [Basic print with Mapfish v3](https://geoext.github.io/geoext/master/examples/print/basic-mapfish.html)
* [Popup on a map component](https://geoext.github.io/geoext/master/examples/popup/gx-popup.html)
* [FeatureGrid component](https://geoext.github.io/geoext/master/examples/features/grid.html)
* [Interactively filtered heatmap](https://geoext.github.io/geoext/master/examples/filtered-heatmap/filtered-heatmap.html)
* [FeatureRenderer component](https://geoext.github.io/geoext/master/examples/renderer/renderer.html)
* [MapView form](https://geoext.github.io/geoext/master/examples/mapviewform/mapviewform.html)

### Modern Toolkit

* [Basic map component ](https://geoext.github.io/geoext3/master/examples/modern-map/modern-map.html)
* [LayerList component ](https://geoext.github.io/geoext3/master/examples/modern-layerlist/modern-layerlist.html)
* [Basic map component ](https://geoext.github.io/geoext/master/examples/modern-map/modern-map.html)
* [LayerList component ](https://geoext.github.io/geoext/master/examples/modern-layerlist/modern-layerlist.html)


## Want to contribute? Yes, please 😀
Expand All @@ -97,12 +97,12 @@ to your contributions!

## Initial Codesprint

To kickstart the new GeoExt 3 project a code sprint has been done in Bonn from 17th to 19th of June 2015. For more informations check the following links: [Code sprint WIKI page](https://github.com/geoext/geoext3/wiki/GeoExt-3-Codesprint), [Official blog post of code sprint day 1](http://geoext.blogspot.de/2015/06/geoext-is-getting-3.html), [Official blog post of the code sprint days 2 and 3](http://geoext.blogspot.de/2015/06/geoext-3-codesprint-day-2-and-3.html)
To kickstart the new GeoExt 3 project a code sprint has been done in Bonn from 17th to 19th of June 2015. For more informations check the following links: [Code sprint WIKI page](https://github.com/geoext/geoext/wiki/GeoExt-3-Codesprint), [Official blog post of code sprint day 1](http://geoext.blogspot.de/2015/06/geoext-is-getting-3.html), [Official blog post of the code sprint days 2 and 3](http://geoext.blogspot.de/2015/06/geoext-3-codesprint-day-2-and-3.html)

---------

<a href="https://www.osgeo.org/projects/geoext/">
<img src="https://geoext.github.io/geoext3/website-resources/img/OSGeo_community.png" alt="OSGeo Community Project" width="200" />
<img src="https://geoext.github.io/geoext/website-resources/img/OSGeo_community.png" alt="OSGeo Community Project" width="200" />
</a>

GeoExt is an OSGeo Community project
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
"OpenLayers",
"ExtJS"
],
"homepage": "https://geoext.github.io/geoext3/",
"homepage": "https://geoext.github.io/geoext/",
"license": "GPL-3.0",
"version": "3.3.2",
"repository": {
"type": "git",
"url": "https://github.com/geoext/geoext3.git"
"url": "https://github.com/geoext/geoext.git"
},
"bugs": {
"url": "https://github.com/geoext/geoext3/issues"
"url": "https://github.com/geoext/geoext/issues"
},
"files": [
"classic/",
Expand Down Expand Up @@ -54,7 +54,7 @@
"generate:docs-w-ext:master": "jsduck --config=jsduck-w-ext.json --output=master/docs-w-ext --title=\"GeoExt $npm_package_version-dev Documentation (incl. ExtJS classes)\"",
"generate:docs:tag": "jsduck --config=jsduck.json --output=$npm_package_version/docs --title=\"GeoExt $npm_package_version Documentation\"",
"generate:docs-w-ext:tag": "jsduck --config=jsduck-w-ext.json --output=$npm_package_version/docs-w-ext --title=\"GeoExt $npm_package_version Documentation (incl. ExtJS classes)\"",
"release": "npm run build && np --no-yarn --contents dist && git push https://github.com/geoext/geoext3.git master --tags"
"release": "npm run build && np --no-yarn --contents dist && git push https://github.com/geoext/geoext.git master --tags"
},
"devDependencies": {
"browser-sync": "2.26.14",
Expand Down
10 changes: 5 additions & 5 deletions universal-app.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ If the application is running properly, you can stop the web server with `CONTRO

### Add GeoExt 3 to your app

Since [GeoExt v3.0.0](https://github.com/geoext/geoext3/releases/tag/v3.0.0) it is strongly recommended that app devs use GeoExt 3 via git clone, especially if the latest (and greatest) version should be used.
Since [GeoExt v3.0.0](https://github.com/geoext/geoext/releases/tag/v3.0.0) it is strongly recommended that app devs use GeoExt 3 via git clone, especially if the latest (and greatest) version should be used.

Alternatively the released versions are published as [ExtJS package](http://docs.sencha.com/cmd/6.x/cmd_packages/cmd_packages.html). They can be used as any other ExtJS package, taking advantage of Sencha cmd.

Expand All @@ -68,7 +68,7 @@ Clone the latest GeoExt 3 code from the official github repository:
```
mkdir lib
cd lib
git clone https://github.com/geoext/geoext3.git
git clone https://github.com/geoext/geoext.git
cd ..
```

Expand All @@ -86,7 +86,7 @@ Adjust the `classpath` property in your ``app.json`` like below.
The released version of GeoExt 3 are available as a ExtJS package. We need to tell Sencha cmd where it can find the `GeoExt3` package.

```
sencha package repo add GeoExt http://geoext.github.io/geoext3/cmd/pkgs
sencha package repo add GeoExt http://geoext.github.io/geoext/cmd/pkgs
```

Sencha cmd can be used to check that GeoExt repository is known. Later Sencha cmd will fetch the GeoExt 3 package from the repository to build our application.
Expand All @@ -102,8 +102,8 @@ Sencha Cmd v6.2.1.29
[INF] Remote repository connections (3):
[INF]
[INF] sencha - http://cdn.sencha.com/cmd/packages/
[INF] GeoExt - http://geoext.github.io/geoext3/cmd/pkgs/
[INF] font-awesome - http://geoext.github.io/geoext3/cmd/pkgs/
[INF] GeoExt - http://geoext.github.io/geoext/cmd/pkgs/
[INF] font-awesome - http://geoext.github.io/geoext/cmd/pkgs/
```
Add the following GeoExt 3 path `"packages/remote/GeoExt/src"` to the `classpath`:

Expand Down

0 comments on commit 95f8fc8

Please sign in to comment.