diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupCategoryForm.scala b/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupCategoryForm.scala index 662043472e9..6b633568171 100644 --- a/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupCategoryForm.scala +++ b/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupCategoryForm.scala @@ -105,7 +105,7 @@ class NodeGroupCategoryForm( val html = SHtml.ajaxForm(
-
Category details
+
Category details

diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleDisplayer.scala b/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleDisplayer.scala index 71922a66ae8..8bfc6fc14b1 100644 --- a/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleDisplayer.scala +++ b/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleDisplayer.scala @@ -214,13 +214,13 @@ class RuleDisplayer ( case Full(ruleCategoryTree) =>
-
CATEGORIES
+
Categories
{viewCategories(ruleCategoryTree)}
-
RULES
+
Rule
{viewRules}
diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueCategoryEditForm.scala b/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueCategoryEditForm.scala index 29bd773f74f..78760f4a87f 100644 --- a/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueCategoryEditForm.scala +++ b/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueCategoryEditForm.scala @@ -91,7 +91,7 @@ class TechniqueCategoryEditForm( def showForm() : NodeSeq = {
-
Category details
+
Category details
{categoryDetailsForm}
diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/model/DirectiveEditor.scala b/rudder-web/src/main/scala/com/normation/rudder/web/model/DirectiveEditor.scala index 00fa5f3e7a7..db6fbec9a9f 100644 --- a/rudder-web/src/main/scala/com/normation/rudder/web/model/DirectiveEditor.scala +++ b/rudder-web/src/main/scala/com/normation/rudder/web/model/DirectiveEditor.scala @@ -298,7 +298,7 @@ case class SectionFieldImp( else
-
Section: { name }
+
Section: { name }
{ childrenXml }
@@ -312,7 +312,7 @@ case class SectionFieldImp( else
-
Section: { name }
+
Section: { name }
{ childrenXml } @@ -444,7 +444,7 @@ case class MultivaluedSectionField( val classes = "groupFieldset foldableSection " + section.visibilityClasses
-
{ "%s #%s".format(name, i + 1) }
+
{ "%s #%s".format(name, i + 1) }
{ showFormEntry(section, i) } { // showAddAnother under the last element if ((i + 1) == size) { @@ -511,7 +511,7 @@ case class MultivaluedSectionField(
{ (allSections.map { sect =>
-
{ "%s".format(name) }
+
{ "%s".format(name) }
{ sect.toHtmlNodeSeq } diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/DirectiveManagement.scala b/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/DirectiveManagement.scala index 8e7786e21a4..65b078b8132 100644 --- a/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/DirectiveManagement.scala +++ b/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/DirectiveManagement.scala @@ -231,7 +231,7 @@ class DirectiveManagement extends DispatchSnippet with Loggable { "#techniqueDetails *" #> ( currentTechnique match { case None => - ".inner-portlet-header *" #> "Usage" & + ".page-title *" #> "Usage" & "#details *" #> {

Directives are displayed in the tree of diff --git a/rudder-web/src/main/webapp/secure/administration/apiManagement.html b/rudder-web/src/main/webapp/secure/administration/apiManagement.html index eac34a0cc48..5330735fd4a 100644 --- a/rudder-web/src/main/webapp/secure/administration/apiManagement.html +++ b/rudder-web/src/main/webapp/secure/administration/apiManagement.html @@ -41,7 +41,7 @@

-
Configure allowed accounts
+
Configure allowed accounts
diff --git a/rudder-web/src/main/webapp/secure/administration/databaseManagement.html b/rudder-web/src/main/webapp/secure/administration/databaseManagement.html index 0c973a06dd8..8855afbba86 100644 --- a/rudder-web/src/main/webapp/secure/administration/databaseManagement.html +++ b/rudder-web/src/main/webapp/secure/administration/databaseManagement.html @@ -22,7 +22,7 @@
-
Active reports +
Active reports
@@ -60,7 +60,7 @@
-
Archived reports
+
Archived reports
Archived reports are stored in an SQL table without any indexes, @@ -95,7 +95,7 @@
-
Automatic report cleaning
+
Automatic report cleaning
@@ -137,7 +137,7 @@
-
Manual report cleaning
+
Manual report cleaning
diff --git a/rudder-web/src/main/webapp/secure/administration/pluginManagement.html b/rudder-web/src/main/webapp/secure/administration/pluginManagement.html index daa3c2099e2..7f2c2d9aba3 100644 --- a/rudder-web/src/main/webapp/secure/administration/pluginManagement.html +++ b/rudder-web/src/main/webapp/secure/administration/pluginManagement.html @@ -6,13 +6,13 @@
-
Plugins
+
Plugins

Plugins can extend Rudder’s base functionality to add extra features. They can be either open source or proprietary (this is up to the plugin author).

-
[Here comes the plugins name]
+
[Here comes the plugins name]
diff --git a/rudder-web/src/main/webapp/secure/administration/policyServerManagement.html b/rudder-web/src/main/webapp/secure/administration/policyServerManagement.html index d5d3ac07f49..ba71b4bf549 100644 --- a/rudder-web/src/main/webapp/secure/administration/policyServerManagement.html +++ b/rudder-web/src/main/webapp/secure/administration/policyServerManagement.html @@ -40,7 +40,7 @@
-
Client-server communication
+
Client-server communication
@@ -125,7 +125,7 @@

Security

-
Configure compliance mode
+
Configure compliance mode
@@ -155,7 +155,7 @@

Security

-
Agent run schedule
+
Agent run schedule
@@ -298,7 +298,7 @@

Security

-
Configure change audit logs
+
Configure change audit logs
@@ -335,7 +335,7 @@

Security

-
Configure Change Requests (validation workflow)
+
Configure Change Requests (validation workflow)
@@ -377,7 +377,7 @@

Security

-
Configure file retention
+
Configure file retention
@@ -415,7 +415,7 @@

Security

-
Logging
+
Logging
@@ -445,7 +445,7 @@

Security

-
Clear policy caches
+
Clear policy caches
@@ -473,7 +473,7 @@

Security

-
Manage dynamic groups
+
Manage dynamic groups
@@ -501,7 +501,7 @@

Security

-
Manage Technique library
+
Manage Technique library
diff --git a/rudder-web/src/main/webapp/secure/administration/techniqueLibraryManagement.html b/rudder-web/src/main/webapp/secure/administration/techniqueLibraryManagement.html index 5735dc70dc1..9e557b80313 100644 --- a/rudder-web/src/main/webapp/secure/administration/techniqueLibraryManagement.html +++ b/rudder-web/src/main/webapp/secure/administration/techniqueLibraryManagement.html @@ -34,7 +34,7 @@
-
Technique library
+
Technique library
Only Techniques in the User library are available to create new Directives. Add new Techniques by Drag'n'droping them from Reference library to User library categories. @@ -46,7 +46,7 @@
-
Reference Technique library
+
Reference Technique library
Open all categories @@ -74,7 +74,7 @@
-
Active Techniques library
+
Active Techniques library
Open all categories diff --git a/rudder-web/src/main/webapp/secure/configurationManager/directiveManagement.html b/rudder-web/src/main/webapp/secure/configurationManager/directiveManagement.html index cd584d611cc..2717acf8d94 100644 --- a/rudder-web/src/main/webapp/secure/configurationManager/directiveManagement.html +++ b/rudder-web/src/main/webapp/secure/configurationManager/directiveManagement.html @@ -73,7 +73,7 @@
-
Directive Library
+
Directive Library
+ @@ -98,7 +98,7 @@
-
Technique information
+
Technique information
The Directive [Directive] is based on following Technique: diff --git a/rudder-web/src/main/webapp/secure/configurationManager/parameterManagement.html b/rudder-web/src/main/webapp/secure/configurationManager/parameterManagement.html index 2f0d6fdf8be..1b99504565e 100644 --- a/rudder-web/src/main/webapp/secure/configurationManager/parameterManagement.html +++ b/rudder-web/src/main/webapp/secure/configurationManager/parameterManagement.html @@ -8,7 +8,7 @@
-
List of Global Parameters
+
List of Global Parameters

Here, you can create, update or delete Global Parameters.

diff --git a/rudder-web/src/main/webapp/secure/configurationManager/ruleManagement.html b/rudder-web/src/main/webapp/secure/configurationManager/ruleManagement.html index 9a64acca264..cef09f2c921 100644 --- a/rudder-web/src/main/webapp/secure/configurationManager/ruleManagement.html +++ b/rudder-web/src/main/webapp/secure/configurationManager/ruleManagement.html @@ -14,7 +14,7 @@

-
Rule details
+
Rule details
diff --git a/rudder-web/src/main/webapp/secure/nodeManager/groups.html b/rudder-web/src/main/webapp/secure/nodeManager/groups.html index 6efabdf9370..f973d04da89 100644 --- a/rudder-web/src/main/webapp/secure/nodeManager/groups.html +++ b/rudder-web/src/main/webapp/secure/nodeManager/groups.html @@ -20,7 +20,7 @@
-
Group hierarchy
+
Group hierarchy
diff --git a/rudder-web/src/main/webapp/secure/nodeManager/manageNewNode.html b/rudder-web/src/main/webapp/secure/nodeManager/manageNewNode.html index 0f146407019..95f8673ced0 100644 --- a/rudder-web/src/main/webapp/secure/nodeManager/manageNewNode.html +++ b/rudder-web/src/main/webapp/secure/nodeManager/manageNewNode.html @@ -6,7 +6,7 @@
-
Accept new Nodes
+
Accept new Nodes
Accept or refuse Nodes in your infrastructure that have declared themselves to Rudder by sending an inventory report. To add new nodes, install the rudder-agent package on a machine, and follow the instructions provided.
diff --git a/rudder-web/src/main/webapp/secure/nodeManager/nodes.html b/rudder-web/src/main/webapp/secure/nodeManager/nodes.html index 149e97a8a08..fe0c6b547de 100644 --- a/rudder-web/src/main/webapp/secure/nodeManager/nodes.html +++ b/rudder-web/src/main/webapp/secure/nodeManager/nodes.html @@ -7,7 +7,7 @@
-
Nodes
+
Nodes
diff --git a/rudder-web/src/main/webapp/secure/nodeManager/searchNodes.html b/rudder-web/src/main/webapp/secure/nodeManager/searchNodes.html index 87ef5e288fc..985975a6de8 100644 --- a/rudder-web/src/main/webapp/secure/nodeManager/searchNodes.html +++ b/rudder-web/src/main/webapp/secure/nodeManager/searchNodes.html @@ -17,7 +17,7 @@
-
Query based search
+
Query based search
Find nodes in your Rudder infrastructure that match different criteria.
diff --git a/rudder-web/src/main/webapp/secure/utilities/archiveManagement.html b/rudder-web/src/main/webapp/secure/utilities/archiveManagement.html index e4538049295..f02e9ba817f 100644 --- a/rudder-web/src/main/webapp/secure/utilities/archiveManagement.html +++ b/rudder-web/src/main/webapp/secure/utilities/archiveManagement.html @@ -48,7 +48,7 @@
-
Global archive
+
Global archive
Archive or restore settings (Groups, Rules, Directives and active Techniques) from Rudder to backup, restore or transfer items between Rudder instances. @@ -81,7 +81,7 @@
-
Archive groups
+
Archive groups
@@ -114,7 +114,7 @@
-
Archive Rules
+
Archive Rules
@@ -149,7 +149,7 @@
-
Archive Directives and active Techniques
+
Archive Directives and active Techniques
diff --git a/rudder-web/src/main/webapp/secure/utilities/changeRequests.html b/rudder-web/src/main/webapp/secure/utilities/changeRequests.html index 5a809f88975..fec91264923 100644 --- a/rudder-web/src/main/webapp/secure/utilities/changeRequests.html +++ b/rudder-web/src/main/webapp/secure/utilities/changeRequests.html @@ -13,7 +13,7 @@
-
Change Requests
+
Change Requests
diff --git a/rudder-web/src/main/webapp/secure/utilities/eventLogs.html b/rudder-web/src/main/webapp/secure/utilities/eventLogs.html index 2f67a376d03..f892684175a 100644 --- a/rudder-web/src/main/webapp/secure/utilities/eventLogs.html +++ b/rudder-web/src/main/webapp/secure/utilities/eventLogs.html @@ -6,7 +6,7 @@
-
Event Logs
+
Event Logs

diff --git a/rudder-web/src/main/webapp/style/rudder.css b/rudder-web/src/main/webapp/style/rudder.css index 22e8a4ec678..ee76f703ed6 100644 --- a/rudder-web/src/main/webapp/style/rudder.css +++ b/rudder-web/src/main/webapp/style/rudder.css @@ -872,16 +872,16 @@ fieldset.techniqueDetailsFieldset { padding: 1px 10px 1px 10px; } -div.foldableSection div.inner-portlet-header-lower { +div.foldableSection div.section-title { cursor: pointer; } -div.unfoldedSection div.inner-portlet-header-lower:before { +div.unfoldedSection div.section-title:before { content: url("../images/tableau/flecheBasGris.png"); padding-right: 3px; } -div.foldedSection div.inner-portlet-header-lower:before { +div.foldedSection div.section-title:before { content: url("../images/tableau/flecheDroiteGris.png"); padding-right: 3px; } @@ -891,7 +891,7 @@ div.foldedSection div.inner-portlet-header-lower:before { display:none; } -.foldedSection div.inner-portlet-header-lower { +.foldedSection div.section-title { display:block; } @@ -1621,17 +1621,18 @@ p img { background: none; } -.inner-portlet-header { - font-size: 1.3em; +.page-title { + font-size: 17px; font-weight: bold; cursor: default; background: none; border-bottom: 1px solid #F79D10; padding: 5px 0 2px 5px; + text-transform:uppercase; } -.inner-portlet-header-lower { - font-size: 1.3em; +.section-title { + font-size: 15px; cursor: default; background: none; border-bottom: 1px solid #F79D10; diff --git a/rudder-web/src/main/webapp/templates-hidden/components/ComponentDirectiveEditForm.html b/rudder-web/src/main/webapp/templates-hidden/components/ComponentDirectiveEditForm.html index b356bd843e5..f77b130c6af 100644 --- a/rudder-web/src/main/webapp/templates-hidden/components/ComponentDirectiveEditForm.html +++ b/rudder-web/src/main/webapp/templates-hidden/components/ComponentDirectiveEditForm.html @@ -89,13 +89,13 @@
-
Directive
+
Directive
-
Pending change requests
+
Pending change requests

Warning! @@ -109,7 +109,7 @@
-
Directive information
+
Directive information

@@ -171,12 +171,12 @@
-
Parameters
+
Parameters
Here goes the list of parameters
-
Target Rules
+
Target Rules
@@ -208,7 +208,7 @@ -
Directive information
+
Directive information

@@ -273,13 +273,13 @@
-
Categories
+
Categories
-
Rules
+
Rules
diff --git a/rudder-web/src/main/webapp/templates-hidden/components/ComponentRuleEditForm.html b/rudder-web/src/main/webapp/templates-hidden/components/ComponentRuleEditForm.html index 74adfcc5fcf..ae2414a7dd2 100644 --- a/rudder-web/src/main/webapp/templates-hidden/components/ComponentRuleEditForm.html +++ b/rudder-web/src/main/webapp/templates-hidden/components/ComponentRuleEditForm.html @@ -168,7 +168,7 @@

-
GENERAL INFORMATION
+
General information
Here comes the name field @@ -191,8 +191,8 @@
-
- DIRECTIVES +
@@ -200,8 +200,8 @@

-
- GROUPS +
diff --git a/rudder-web/src/main/webapp/templates-hidden/components/ComponentTechniqueEditForm.html b/rudder-web/src/main/webapp/templates-hidden/components/ComponentTechniqueEditForm.html index 50290d1a1d6..a2004dd1aa7 100644 --- a/rudder-web/src/main/webapp/templates-hidden/components/ComponentTechniqueEditForm.html +++ b/rudder-web/src/main/webapp/templates-hidden/components/ComponentTechniqueEditForm.html @@ -59,7 +59,7 @@
-
Technique details
+
Technique details
@@ -92,13 +92,13 @@

[technique.description]

-
Category
+
Category
Reference category:
    [here come the breadcrump]
[Here come the text for the client category breadcrump]
-
Parameters
+
Parameters
[Here comes template parameters]
diff --git a/rudder-web/src/main/webapp/templates-hidden/components/NodeGroupForm.html b/rudder-web/src/main/webapp/templates-hidden/components/NodeGroupForm.html index f818b9c4413..eb9a48ce148 100644 --- a/rudder-web/src/main/webapp/templates-hidden/components/NodeGroupForm.html +++ b/rudder-web/src/main/webapp/templates-hidden/components/NodeGroupForm.html @@ -53,7 +53,7 @@

Details of a node

-
+
Group details
@@ -71,7 +71,7 @@

Details of a node



-
Group criteria
+
Group criteria