Skip to content

Commit

Permalink
GUI updates:
Browse files Browse the repository at this point in the history
* [x]  README in project polemarch/ce#1
* [x]  Execution_time was fixed to timezone different from UTC polemarch/ce#21
* [x]  Scroll to ansible_ssh_private_key_file field was fixed polemarch/ce#20
* [x]  Labels for documentation on readthedocs was fixed polemarch/ce#18
* [x]  Info about MySQl was added to documentation polemarch/ce#22
* [x]  Ability to choose which line on chart should be visible was added polemarch/ce#24
* [x]  New view for options list and periodic tasks list was added polemarch/ce#26
* [x]  Periodic tasks linked to templates polemarch/ce#25
* [x]  Host list as inventory file was added polemarch/ce#16
* [x]  Mass sync of project was added polemarch/ce#17

Closes #20, #18, and #16

See merge request polemarch/ce!7
  • Loading branch information
onegreyonewhite committed May 22, 2018
2 parents 143f6e9 + 2c5e1f9 commit 4e33be6
Show file tree
Hide file tree
Showing 67 changed files with 4,840 additions and 1,416 deletions.
1 change: 1 addition & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ variables:
GET_SOURCES_ATTEMPTS: 3
ARTIFACT_DOWNLOAD_ATTEMPTS: 3
RESTORE_CACHE_ATTEMPTS: 3
DJANGO_LOG_LEVEL: 'CRITICAL'

cache:
paths:
Expand Down
4 changes: 2 additions & 2 deletions deb.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ Source: $(NAME)
Section: unknown
Priority: optional
Maintainer: $(VENDOR)
Build-Depends: debhelper (>= 9), python-virtualenv, python-pip, python-dev, gcc, libffi-dev, libssl-dev, libyaml-dev, libkrb5-dev
Build-Depends: debhelper (>= 9), python-virtualenv, python-pip, python-dev, gcc, libffi-dev, libssl-dev, libyaml-dev, libkrb5-dev, libssl-dev, libsasl2-dev, libldap2-dev
Standards-Version: 3.9.5
Homepage: https://gitlab.com/vstconsulting/polemarch
Vcs-Git: git@gitlab.com:vstconsulting/polemarch.git
Vcs-Browser: https://gitlab.com/vstconsulting/polemarch.git

Package: $(NAME)
Architecture: amd64
Depends: $${shlibs:Depends}, $${misc:Depends}, python-virtualenv, libffi6, libssl-dev, sshpass, libpython2.7, git, libyaml-dev, libkrb5-dev
Depends: $${shlibs:Depends}, $${misc:Depends}, python-virtualenv, libffi6, libssl-dev, sshpass, libpython2.7, git, libyaml-dev, libkrb5-dev, libssl-dev, libsasl2-dev, libldap2-dev
Description: $(SUMMARY)
$(DESCRIPTION)
endef
Expand Down
30 changes: 30 additions & 0 deletions doc/config.rst
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,36 @@ PostgreSQL. Configuration details you can look at
If you run at Polemarch software at multiple nodes (clusterization), you should
use some of client-server database (SQLite not suitable) shared for all nodes.

If you use MySQL there are a list of required settings, that you should make for correct
database work.

Firstly, if you use MySQL and you have set timezone different from "UTC" you should make
next command:

.. sourcecode:: bash

mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql -u root -p mysql

Secondly, for correct MySQL work you should set next options in ``settings.ini`` file:

.. sourcecode:: bash

[database.options]
init_command = SET sql_mode='STRICT_TRANS_TABLES', default_storage_engine=INNODB, NAMES 'utf8', CHARACTER SET 'utf8', SESSION collation_connection = 'utf8_unicode_ci'

Finally, you should add some options to MySQL configuration:

.. sourcecode:: bash

[client]
default-character-set=utf8
init_command = SET collation_connection = @@collation_database

[mysqld]
character-set-server=utf8
collation-server=utf8_unicode_ci


.. _cache:

Cache settings
Expand Down
31 changes: 24 additions & 7 deletions doc/gui.rst
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ As you can see, the form of new GIT project creation consist of 5 fields:
After project creation you will the next page:

.. image:: gui_png/test-project.png
.. image:: gui_png/test-project2.png

As you can see at image above for GIT project
it is possible to choose a branch to what user want to sync. In this example user will sync
Expand All @@ -222,6 +223,11 @@ Also there are 2 new fields:
ERROR - synchronization failed,
OK - project is synchronized.

There is new section on this page:

* **Reame.md** - if project has “readme.md” or “readme.rst” file in it’s project directory,
Polemarch will add content of this file to this section.

Also there are several buttons on this page:

* **save** - this button saves all changes you have made on this page.
Expand Down Expand Up @@ -438,7 +444,9 @@ But also there are some new buttons here:

* **save and execute** - this button saves all changes you have made on this page and executes this template.

* **create new option** - this button opens the "Create new option" page.
* **options** - this button opens the page with this template options list.

* **periodic tasks** - this button opens the page with the list of periodic tasks based on this template.

* **history** - this button opens history list of template executions.

Expand All @@ -453,6 +461,10 @@ Sometimes your need to keep some similar templates, which are different by only
In this case template options will be extremly useful for you. In every template you can create
a lot of options which can modify this template by some parameters. Let's look at the example:

.. image:: gui_png/empty-options-list.png

As you can see, now there are no options for this template. Let's create the first one.

.. image:: gui_png/create-new-option.png

As you can see there are 2 section on this page: "New option" and "Adding new argument".
Expand Down Expand Up @@ -513,12 +525,6 @@ As you can see there are 2 sections on this page: "New task" and "Adding new arg
* **save in history** - if value is true, the fact of task execution will be saved in history records.
Otherwise, no history records about this periodic task execution will be saved.

* **inventory source** - source of inventory. It can be either "From database" or "From file in project dir".

* **inventory from project / inventory file** - name of inventory.

* **group** - name of group to which this periodic task will be executed.

* **kind** - kind of task: module or playbook.

* **playbook** - name of playbook. This field is available for kind=playbook only.
Expand All @@ -527,8 +533,19 @@ As you can see there are 2 sections on this page: "New task" and "Adding new arg
the ansible module name and Polemarch will suggest you appropriate name values.
This field is available for kind=module only.

* **template from project** - name of template from this project. This field has autocomplete, so you can just start typing
the template name and Polemarch will suggest you appropriate name values. Also it is possible to choose template with some option.
Options' name will be shown in square brackets, for example, "template_name [template_option_name]".
This field is available for kind=template only.

* **group** - name of group to which this periodic task will be executed.

* **args** - arguments for ansible module. This field is available for kind=module only.

* **inventory source** - source of inventory. It can be either "From database" or "From file in project dir".

* **inventory from project / inventory file** - name of inventory.

* **type** - type of schedule. It can be either "Interval schedule" or "Cron style schedule".

* **interval schedule / cron style schedule** - value for schedule.
Expand Down
Binary file modified doc/gui_png/create-periodic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/gui_png/empty-options-list.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/gui_png/module-template-page.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/gui_png/test-periodic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/gui_png/test-project.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/gui_png/test-project2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions doc/polemarch-sphinx-theme/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,11 @@ <h3>Watch us on GitHub</h3>
<!-- Content Wrapper. Contains page content -->
<div class="content-wrapper" id='spajs-right-area'>
<!-- Main content -->

<!-- For notification about not up-to-date-version -->
<div class="body" role="main"></div>
<!-- -->

<section class="content-header">
<h1>Polemarch documentation</h1>
</section>
Expand Down
63 changes: 55 additions & 8 deletions doc/polemarch-sphinx-theme/static/polemarch-style.css
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,9 @@ form.search {
background-position: center center;
background-repeat: no-repeat;
-webkit-background-size:150px 40px;
-o-background-size: 150px 40px;
-moz-background-size:150px 40px;
background-size: 150px 40px;
-o-background-size: 150px 40px;
-moz-background-size:150px 40px;
background-size: 150px 40px;
display: block;
width:150px;
height: 40px;
Expand All @@ -221,9 +221,9 @@ form.search {
background-position: center center;
background-repeat: no-repeat;
-webkit-background-size:40px 40px;
-o-background-size: 40px 40px;
-moz-background-size:40px 40px;
background-size: 40px 40px;
-o-background-size: 40px 40px;
-moz-background-size:40px 40px;
background-size: 40px 40px;
display: block;
width: 40px;
height: 40px;
Expand Down Expand Up @@ -258,7 +258,54 @@ li.toctree-l1.current>a {
padding: 12px 5px 12px 10px!important;
}

/* beginning of styles for badge(label) with versions on Read The Docs */
.rst-versions {
z-index: 3000!important;
}

.rst-current-version > span:first-child {
margin-top: 10px!important;
}


/* end of styles for badge(label) with versions on Read The Docs */


/* beginning of styles for Notification field about current version */
.body {
padding-top: 1px;
}

.body > .warning {
background-color: #FCC;
border: 1px solid #FAA;
}

.body > .admonition {
padding: 7px;
margin-left: 15px;
margin-right: 15px;
border-radius: 3px;
margin-top: 19px;
}

.body > .admonition {

}

.body > .admonition p.admonition-title {
font-weight: normal;
font-size: 24px;
margin: 0 0 10px 0;
padding: 0;
line-height: 1;
}

.body > .admonition p.last {
margin-bottom: 0;
}

/* end of styles for Notification field about current version */

@media (max-width: 767px) {
.bg-logo-doc {
Expand All @@ -268,8 +315,8 @@ li.toctree-l1.current>a {
background-image: url(img/logo/logo-bw.png);
}
.fork-me img {
width:112px;
height:112px;
width:112px;
height:112px;
}

#big-search-input-pm {
Expand Down
Loading

0 comments on commit 4e33be6

Please sign in to comment.