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

Several fixes #129

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/advanced/custom_palettes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ They are SCSS files which contain CSS rules and they may be used in the same man
Custom palettes must be placed in the `files/_themes` folder inside your GLPI installation or the location determined by the `GLPI_VAR_DIR` or `GLPI_THEMES_DIR` configuration options if you overrode them.

All palette files are loaded at all times. This allows the instant preview when switching the palette selection in the user preferences and also makes debugging easier.
Because of this, the CSS rules inside palettes must be restricted using the `:root[data-glpi-theme='mycustompalette']` selector (where mycustompalette is the name of the file and therefor the palette).
Because of this, the CSS rules inside palettes must be restricted using the `:root[data-glpi-theme='mycustompalette']` selector (where *mycustompalette* is the name of the file and therefor the palette).

Custom palettes should also attempt to restrict themselves to changing only the CSS variables that are prefixed with `--tblr` or `--glpi`.
This helps keep the styling of GLPI uniform. However, you are free to make fine-tuned adjustments by changing CSS properties on specific elements as well.
Expand Down
2 changes: 1 addition & 1 deletion source/advanced/status.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ GLPI Status Monitoring

GLPI contains a helpful endpoint for monitoring its health at `/status.php` and the `glpi:system:status` CLI command.
The `/status.php` endpoint does not require you to be logged in and therefore only shows basic status information.
Sensitive information like the GLPI version and plugin names and versions (could be used to identify vulerabilities) are not shown.
Sensitive information like the GLPI version and plugin names and versions (could be used to identify vulnerabilities) are not shown.
Information from the PHP script and the CLI command is presented as JSON.
The difference with the CLI command though is that since it isn't accessible from the web, you can optionally retrieve private information too.

Expand Down
2 changes: 1 addition & 1 deletion source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
language = None
language = 'en'

# There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used:
Expand Down
2 changes: 1 addition & 1 deletion source/first-steps/access-glpi.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ The first step is to configure the desired authentication method(s).
GLPI is able to manage user authentication and information completely locally in its database, however it is recommended to delegate the authentication to an external service like LDAP.
See :doc:`Configuring authentication methods <../modules/configuration/authentication/index>` for more information.

The import or creation of new users and management of users known to GLPI including deletion, syncronization, activation/deactivation and management of information such as email, phone, etc is covered in :doc:`the user administration documentation <../modules/administration/users/users>`.
The import or creation of new users and management of users known to GLPI including deletion, synchronization, activation/deactivation and management of information such as email, phone, etc is covered in :doc:`the user administration documentation <../modules/administration/users/users>`.

A user can associated with groups, entities, and profiles which are the means of determining usage contexts.

Expand Down
4 changes: 2 additions & 2 deletions source/first-steps/interfaces.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ User interfaces

.. note::

The choice of the default interface as well as the visiblity of different modules can be configured in the profiles or from :doc:`the user's preferences <preferences>`.
The choice of the default interface as well as the visibility of different modules can be configured in the profiles or from :doc:`the user's preferences <preferences>`.

.. _standard_interface:

Expand All @@ -26,7 +26,7 @@ It is divided into 5 views:
A customizable dashboard
* *Personal view*

Shows the tickets opened, rejected, to be processed, to be approved (for which the logged-in user is the requestor) or those on which this user has an interaction as a validator or technician (awaiting validation, in progress, to be closed, in waiting). This view also offers him current issues, his schedule and available notes.
Shows the tickets opened, rejected, to be processed, to be approved (for which the logged-in user is the requester) or those on which this user has an interaction as a validator or technician (awaiting validation, in progress, to be closed, in waiting). This view also offers him current issues, his schedule and available notes.
* *Group view*

Offers the same information about tickets and issues as the personal view, but using the groups to which it belongs as a reference. Depending on their profile, they may or may not have access to the tickets for which their groups are requesting.
Expand Down
68 changes: 34 additions & 34 deletions source/first-steps/preferences.rst
Original file line number Diff line number Diff line change
Expand Up @@ -92,29 +92,29 @@ General customisation
:align: center
:scale: 42 %

- **Language** : change the language of your interface (the language in this section takes over if another language is defined in the `default values <../../../modules/configuration/general/default_values.html>`_ of the general configuration)
- **Display order of surnames** : how do you want to display the identity of your contacts (surname, first name or first name, surname)
- **Results to display by page** : select the number of results to display for the various searches carried out in the modules (1 to 50)
- **Display the tree dropdown complete name in dropdown inputs** : whether or not to display the full names of drop-down lists (if not, this may affect the layout in some cases) (Yes / No)
- **Diplay counters** : display the counters of saved searches (Yes / No)
- **Keep devices when purging an item** : (Yes / No. No by default)
- **Results to display on home page** : display the number of results on the home page of a module (tickets, computers, etc.) (5 to 30)
- **CSV delimiter** : delimiter for import/export CSV (; or , by default **;**)
- **Page layout** : change the position of the main menu (horizontal or vertical)
- **Enable high constrast** : feature that alters the colors (Yes / No)
- **Default central bar** : choose which element will be visible on your home page (dashboard, personal view, group view, global view, RSS feeds)
- **Show search from above results** : whether or not to include the search engine in the toolbar (Yes / No)
- **Date format** : how to display date (YYY-MM-DD,DD-MM-YYYY, MM-DD-YYYY)
- **Number format** : how to display number (1 234.56 / 1,2345.56 / 1 234,56 / 1234.56 / 1234,56)
- **Go to created item after creation** : After creating an object, you can go directly to this object (Yes / No)
- **Display the complete name of tree dopdown in search results** : Yes / No
- **Show GLPI ID** : show the ID of the GLPI's objects (Yes / No)
- Notifications for my changes :
- **PDF export font** : choose the font for PDF exports
- **Color palette** : Choose your theme for your GLPI interface
- **Rich text field layout** : define the behaviour of the text formatting bar
- **Timezone** : select your timezone
- **Timeline order** : order of display of the history of the different types of follow-up in a ticket (natural order (old items on top, recent on bottom) reverse order (old times on bottom, recent on top))
- **Language**: change the language of your interface (the language in this section takes over if another language is defined in the `default values <../../../modules/configuration/general/default_values.html>`_ of the general configuration)
- **Display order of surnames**: how do you want to display the identity of your contacts (surname, first name or first name, surname)
- **Results to display by page**: select the number of results to display for the various searches carried out in the modules (1 to 50)
- **Display the tree dropdown complete name in dropdown inputs**: whether or not to display the full names of drop-down lists (if not, this may affect the layout in some cases) (Yes / No)
- **Display counters**: display the counters of saved searches (Yes / No)
- **Keep devices when purging an item**: (Yes / No. No by default)
- **Results to display on home page**: display the number of results on the home page of a module (tickets, computers, etc.) (5 to 30)
- **CSV delimiter**: delimiter for import/export CSV (; or , by default **;**)
- **Page layout**: change the position of the main menu (horizontal or vertical)
- **Enable high contrast**: feature that alters the colors (Yes / No)
- **Default central bar**: choose which element will be visible on your home page (dashboard, personal view, group view, global view, RSS feeds)
- **Show search from above results**: whether or not to include the search engine in the toolbar (Yes / No)
- **Date format**: how to display date (YYY-MM-DD,DD-MM-YYYY, MM-DD-YYYY)
- **Number format**: how to display number (1 234.56 / 1,2345.56 / 1 234,56 / 1234.56 / 1234,56)
- **Go to created item after creation**: After creating an object, you can go directly to this object (Yes / No)
- **Display the complete name of tree dropdown in search results**: Yes / No
- **Show GLPI ID**: show the ID of the GLPI objects (Yes / No)
- **Notifications for my changes**: begin notified for your own changes
- **PDF export font**: choose the font for PDF exports
- **Color palette**: Choose your theme for your GLPI interface
- **Rich text field layout**: define the behaviour of the text formatting bar
- **Timezone**: select your timezone
- **Timeline order**: order of display of the history of the different types of follow-up in a ticket (natural order (old items on top, recent on bottom) reverse order (old times on bottom, recent on top))

.. note::

Expand All @@ -129,23 +129,23 @@ Assistance customisation and priority colors
:align: center
:scale: 42 %

- **Private followups by default** : all your follow-ups will be considered private. To make them public, uncheck the private box (Yes / No)
- **Private tasks by default** : all your tasks will be considered private. To make them public, uncheck the private box (Yes / No)
- **Tasks state by default** : choose the default status for your tasks (Information, To do, Done)
- **Pre-select me as a technician when adding a ticket follow-up** : when you create a ticket as a technician, choose whether you will be selected as "assigned to" (Yes / No)
- **Private followups by default**: all your follow-ups will be considered private. To make them public, uncheck the private box (Yes / No)
- **Private tasks by default**: all your tasks will be considered private. To make them public, uncheck the private box (Yes / No)
- **Tasks state by default**: choose the default status for your tasks (Information, To do, Done)
- **Pre-select me as a technician when adding a ticket follow-up**: when you create a ticket as a technician, choose whether you will be selected as "assigned to" (Yes / No)
- **Add me as a technician when adding a ticket follow-up**: if you are not assigned to the ticket and you add a follow-up, you will be assigned to this ticket (Yes / No)
- **Action button layout** : choose the layout of the buttons when you are about to reply to a ticket (Splitted or Merged)
- **Show new tickets on the home page** : display tickets in the global view from the home page (Yes / No)
- **Request sources bu default** : when creating a ticket (before submission), define the source of the request (Direct / E-Mail / Fromcreator / Other / Phone / Written)
- **Automatically refresh data (tickets list, project kanban) in minutes** : Choose whether you want to update your interface pages regularly (never to 30)
- **Action button layout**: choose the layout of the buttons when you are about to reply to a ticket (*Splitted* or *Merged*)
- **Show new tickets on the home page**: display tickets in the global view from the home page (Yes / No)
- **Request sources bu default**: when creating a ticket (before submission), define the source of the request (Direct / E-Mail / Fromcreator / Other / Phone / Written)
- **Automatically refresh data (tickets list, project kanban) in minutes**: Choose whether you want to update your interface pages regularly (never to 30)

.. Warning::

Be careful, if you activate this option, it is possible that the refresh will take place when you write a follow-up, for example, which will cause you to lose what you have written. We advise you to deactivate this option.

- **Pre-select me as a requester when creating a ticket** : indicate me as the requester when I write a new ticket (this does not prevent you from selecting other people/groups at a later date if you have the rights to do so). (Yes / No)
- **Add me as a technician when adding a ticket solution** : Add me as a technician when I add a solution to the ticket if it wasn't already assigned to me (Yes /No)
- **Timeline date display** : deletes seconds from dates (Precise / Relative)
- **Pre-select me as a requester when creating a ticket**: indicate me as the requester when I write a new ticket (this does not prevent you from selecting other people/groups at a later date if you have the rights to do so). (Yes / No)
- **Add me as a technician when adding a ticket solution**: Add me as a technician when I add a solution to the ticket if it wasn't already assigned to me (Yes /No)
- **Timeline date display**: deletes seconds from dates (Precise / Relative)

You can change the priority colours. This will change all the colours for the :

Expand Down
4 changes: 2 additions & 2 deletions source/first-steps/search.rst
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ Using the table view
--------------------

In the table view, you have the option to sort the results by any of the displayed fields by clicking on the relevant column headers.
You may perform a multi-sort by holding the ``Ctrl`` or ``Command (MacOS)`` keys while left clicking on the column header.
You may perform a multi-sort by holding the ``Ctrl`` or ``Command`` (MacOS) keys while left clicking on the column header.
Clicking on column headers multiple times will cycle between sort directions and removing the sort.

At the bottom of the results table is a dropdown that can be used to change the number of results that will show on each page.
Expand Down Expand Up @@ -162,7 +162,7 @@ The results of the actions as well as the information messages are presented at

.. warning::

The number of elements that can be handled simultaneously is limited by the values ​​of ``max_input_vars`` or ``suhosin.post.max_vars`` in your PHP configuration. You may therefore get a message indicating that massive edits are disabled. You just need to increase the values ​​of your PHP configuration or reduce the number of items displayed.
The number of elements that can be handled simultaneously is limited by the values of ``max_input_vars`` or ``suhosin.post.max_vars`` in your PHP configuration. You may therefore get a message indicating that massive edits are disabled. You just need to increase the values ​​of your PHP configuration or reduce the number of items displayed.

Quick search
------------
Expand Down
6 changes: 3 additions & 3 deletions source/glossary.rst
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ Glossary
Permission applicable to a given scope (entity).

Tacit renewal
The contract is renewed automaticaly if none of the parties declares its will to break it.
The contract is renewed automatically if none of the parties declares its will to break it.

External link
Link displayed on an asset form in GLPI and built dynamically using the asset data.
Expand Down Expand Up @@ -323,7 +323,7 @@ Glossary
:abbr:`VLAN (Virtual Local Area Network)` : Virtual Local Network.

Tagged VLAN
A tagged :abbr:`VLAN (Virtual Local Area Network)` is a :term:`VLAN` which tag is transmited in network frame (see `802.1Q <http://fr.wikipedia.org/wiki/IEEE_802.1Q>`_).
A tagged :abbr:`VLAN (Virtual Local Area Network)` is a :term:`VLAN` which tag is transmitted in network frame (see `802.1Q <http://fr.wikipedia.org/wiki/IEEE_802.1Q>`_).

Virtual network port
A virtual network port is a port which does not correspond to a physical network hardware.
Expand All @@ -335,7 +335,7 @@ Glossary
User in charge of tickets processing.

Template
Reusable model of object containing predefined fieds and allowing easier user entry.
Reusable model of object containing predefined fields and allowing easier user entry.

Tier type
Category of providers.
Expand Down
2 changes: 1 addition & 1 deletion source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ GLPI User Documentation
Preface
-------

This documentation covers the installation and use of GLPI (Gestion Libre de Parc Informatique) !
This documentation covers the installation and use of :abbr:`GLPI (Gestion Libre de Parc Informatique)`!

Free and open-source solution for IT asset management and helpdesk, and more. GLPI is a web application designed to manage all of your IT asset management issues from inventory management of hardware components and software to the management of user assistance.

Expand Down
4 changes: 2 additions & 2 deletions source/modules/administration/dictionnaries.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ The *Replay the dictionary rules* button (under the list of rules of the diction

.. hint::
* it is highly recommended to play rules on a test database and to backup database before production launch of the dictionary or before inserting new rules
* a script is available in directory *scripts* of GLPI installation, named *compute\_dictionnary.php*, that allows to launch dictionnary processing in command line mode; this allows to bypass problems of execution limit and provides a significant speedup
* a script is available in directory *scripts* of GLPI installation, named *compute\_dictionnary.php*, that allows to launch dictionary processing in command line mode; this allows to bypass problems of execution limit and provides a significant speedup

Global dictionaries
~~~~~~~~~~~~~~~~~~~
Expand All @@ -39,7 +39,7 @@ The software dictionary modifies software data (name, version, manufacturer) in

This dictionary allows also to redirect the creation of a software or of a set of software in a given entity, by choosing action *Entity* and to select the entity in which to create the software. This functionality can also be used with general option *Entity for software* available in entity configuration.

.. note:: for an optimal management of software and licenses in a multi-entity environment, it is possible to use the software dictionnary simultaneously with software visible in sub-entities and thus to use grouping functionality.
.. note:: for an optimal management of software and licenses in a multi-entity environment, it is possible to use the software dictionary simultaneously with software visible in sub-entities and thus to use grouping functionality.

.. warning:: using action *Add regexp result* on a version must be used with maximum care; indeed, this action is only taken into account when importing data coming from an inventory tool and will be ignored when re-applying dictionary on an existing database.

Expand Down
2 changes: 1 addition & 1 deletion source/modules/administration/index.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Administration
==============

Administration module allows to administrate users, groups, entities, profiles, rules and dictionnaries.
Administration module allows to administrate users, groups, entities, profiles, rules and dictionaries.

.. toctree::
:maxdepth: 1
Expand Down
2 changes: 1 addition & 1 deletion source/modules/administration/profiles/profiles.rst
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ The different permissions of an object are listed on the line of its name. To ac

.. warning:: no permission deduction is done; for example in order to be able to modify an object, read permission must also be granted.

Permissions after migration: migration takes over old permissions in full, regardless of the purpose, and activates the corresponding values ​​in the new system. Previous *Write* permission is transformed into *Read*, *Update*, *Create*, *Delete* and *Purge* for most objects and must then be refined if needed. For others, the permissions are grouped by object, for example, FAQ permission are permissions of the Knowledge Base object.
Permissions after migration: migration takes over old permissions in full, regardless of the purpose, and activates the corresponding values in the new system. Previous *Write* permission is transformed into *Read*, *Update*, *Create*, *Delete* and *Purge* for most objects and must then be refined if needed. For others, the permissions are grouped by object, for example, FAQ permission are permissions of the Knowledge Base object.

Some permissions are standards for all objects:

Expand Down
Loading