Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Doc] reorganize integrator guide #3203

Merged
merged 7 commits into from
Oct 30, 2017
Merged

Conversation

jwkaltz
Copy link
Member

@jwkaltz jwkaltz commented Oct 26, 2017

For issue #3202.
With this pull request, I would like to suggest a first step of reorganization (navigation structure) of the integrator guide.
Once this is settled, I hope we can then think about moving / updating / inserting specific contents in an easier manner -> but that will be in additional PRs.

@jwkaltz jwkaltz changed the title Doc reorganize integrator guide [Doc] reorganize integrator guide Oct 26, 2017
@jwkaltz
Copy link
Member Author

jwkaltz commented Oct 27, 2017

Some files were not checked in (so the travis build fails) because a lot of doc files are listed in the .gitignore of the project...
I do not know why this is so. I will make a separate issue. In the meantime, I will just commit the missing files for this PR.


The UI of c2cgeoportal applications is built from components of the CGXP
JavaScript library. This library is on GitHub:
https://github.com/camptocamp/cgxp.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No CGXP in master exempt in the Legacy chapter

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have not looked yet at the developer guide. This PR is only about the integrator guide... I would prefer to do one step at a time.

NGEO
----

link
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't works on master (with Docker) ...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see above (I have not looked yet at the developer guide. This PR is only about the integrator guide... I would prefer to do one step at a time.)

doc/index.rst Outdated
`with features grid <https://camptocamp.github.io/ngeo/2.3/examples/contribs/gmf/apps/desktop_alt/>`_,
to test the editing you can use the username 'demo' with the password 'demo'.

`ngeo (client) documentation <https://camptocamp.github.io/ngeo/2.3/apidoc/>`_.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all the 2.3 should be generated

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes - I added doc/index.rst by mistake (next commit will remove it - only .mako for this file, no changes in this PR for this part)

.. _integrator_editing:

Editing (with CGXP)
===================
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be in Legacy section

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In fact, this was already included only in Legacy section. But I will rename the file to make it more clear.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

A c2cgeoportal project may define multiple viewers. By default a project
includes two viewers: the *main viewer* and the *editing viewer*. The main
viewer is defined in the ``<package>/templates/viewer.js`` file, while the
editing viewer is defined in the ``<package>/templates/edit.js`` file. Each
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This conser CGXP and should be in legacy section ...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, moving to legacy_cgxp

=====

Adding the *print* feature to a c2cgeoportal project involves adding
a ``cgxp.plugins.Print`` plugin to the viewer, and configuring the MapFish
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cgxp is legacy

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, moving this to legacy_cgxp.rst

be available in the user interface.

See the `Print API doc
<http://docs.camptocamp.net/cgxp/2.3/lib/plugins/Print.html>`_ for the
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2.3 should be generated

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now contained within legacy_cgxp file

Using MapFish Print v3
----------------------

Migration from the v2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be done relay before the 2.3 upgrade ...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I will add a line to requirements.rst for this

* `Startup with Jasper Reports <http://mapfish.github.io/mapfish-print-doc/#/jasperReports>`_


MapFish Print v2 configuration
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't works on 2.3

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will move this section to legacy_print.rst

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not legacy, it don't works ...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, then I simply remove this part

Spec attributes
~~~~~~~~~~~~~~~

With CGXP we have the following spec attributes:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Legacy

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

right; I am moving this.

.gitignore Outdated
@@ -27,12 +27,6 @@
/doc/administrator/administrate.rst
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to be removed ...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, thanks (next commit)

@@ -47,7 +47,7 @@ Dependencies

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we put ngeo before cgxp, anf mark cgxp as legacy?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok done (for next commit)

.gitignore Outdated
@@ -27,12 +27,6 @@
/doc/administrator/administrate.rst
/doc/developer/client_side.rst
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to be removed ...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, thanks (next commit)

@jwkaltz jwkaltz merged commit 632c01d into master Oct 30, 2017
@jwkaltz jwkaltz deleted the doc_reorganize_integrator_guide branch October 30, 2017 05:53
@sbrunner sbrunner added this to the 2.3 milestone Nov 14, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants