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.

Sign up for GitHub

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

Jump to bottom

Fixes #5624: Adapt tiles to their importance #625

Merged
merged 1 commit into from Oct 16, 2014
Merged

Fixes #5624: Adapt tiles to their importance #625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupCategoryForm.scala
View file
Open in desktop
Expand Up @@ -105,7 +105,7 @@ class NodeGroupCategoryForm(
val html = SHtml.ajaxForm(
<div class="inner-portlet groupCategoryUpdateComponent">
<div>
<div class="inner-portlet-header">Category details</div>
<div class="page-title">Category details</div>
</div>
<directive:notifications />
<hr class="spacer"/>
Expand Down
4 changes: 2 additions & 2 deletions rudder-web/src/main/scala/com/normation/rudder/web/components/RuleDisplayer.scala
View file
Open in desktop
Expand Up @@ -214,13 +214,13 @@ class RuleDisplayer (
case Full(ruleCategoryTree) =>
<div style="padding:10px;">
<div style="float:left; width: 20%; overflow:auto">
<div class="inner-portlet-header" style="letter-spacing:1px; padding-top:0;">CATEGORIES</div>
<div class="page-title">Categories</div>
<div class="inner-portlet-content" id="categoryTreeParent">
{viewCategories(ruleCategoryTree)}
</div>
</div>
<div style="float:left; width:78%;padding-left:2%;">
<div class="inner-portlet-header" style="letter-spacing:1px; padding-top:0;" id="categoryDisplay">RULES</div>
<div class="page-title" id="categoryDisplay">Rule</div>
<div class="inner-portlet-content" id={gridId}>
{viewRules}
</div>
Expand Down
2 changes: 1 addition & 1 deletion ...er-web/src/main/scala/com/normation/rudder/web/components/TechniqueCategoryEditForm.scala
View file
Open in desktop
Expand Up @@ -91,7 +91,7 @@ class TechniqueCategoryEditForm(

def showForm() : NodeSeq = {
<div id={htmlId_form} class="object-details">
<div class="inner-portlet-header-lower">Category details</div>
<div class="section-title">Category details</div>
{categoryDetailsForm}
<div id="removeCategoryActionDialog" class="nodisplay">
<div class="simplemodal-title">
Expand Down
8 changes: 4 additions & 4 deletions rudder-web/src/main/scala/com/normation/rudder/web/model/DirectiveEditor.scala
View file
Open in desktop
Expand Up @@ -298,7 +298,7 @@ case class SectionFieldImp(
else
<tr><td colspan="2">
<div id={sectionId} class={classes}>
<div class="inner-portlet-header-lower" onClick={methodName}>Section: { name }</div>
<div class="section-title" onClick={methodName}>Section: { name }</div>
<table class="directiveSectionDef">
{ childrenXml }
</table>
Expand All @@ -312,7 +312,7 @@ case class SectionFieldImp(
else
<tr><td colspan="2">
<div>
<div class="inner-portlet-header-lower">Section: { name }</div>
<div class="section-title">Section: { name }</div>
<table class="directiveSectionDisplay">
<tbody>
{ childrenXml }
Expand Down Expand Up @@ -444,7 +444,7 @@ case class MultivaluedSectionField(

val classes = "groupFieldset foldableSection " + section.visibilityClasses
<div id={sectionId} class={classes}>
<div class="inner-portlet-header-lower" onClick={methodName}>{ "%s #%s".format(name, i + 1) }</div>
<div class="section-title" onClick={methodName}>{ "%s #%s".format(name, i + 1) }</div>
{ showFormEntry(section, i) }
{ // showAddAnother under the last element
if ((i + 1) == size) {
Expand Down Expand Up @@ -511,7 +511,7 @@ case class MultivaluedSectionField(
<div class="directiveGroup">{
(allSections.map { sect =>
<div class="groupFieldset">
<div class="inner-portlet-header-lower">{ "%s".format(name) }</div>
<div class="section-title">{ "%s".format(name) }</div>
<table class="directiveGroupDisplay">
<tbody>
{ sect.toHtmlNodeSeq }
Expand Down
2 changes: 1 addition & 1 deletion ...b/src/main/scala/com/normation/rudder/web/snippet/configuration/DirectiveManagement.scala
View file
Open in desktop
Expand Up @@ -231,7 +231,7 @@ class DirectiveManagement extends DispatchSnippet with Loggable {

"#techniqueDetails *" #> ( currentTechnique match {
case None =>
".inner-portlet-header *" #> "Usage" &
".page-title *" #> "Usage" &
"#details *" #> {
<div class="deca">
<p><em>Directives</em> are displayed in the tree of
Expand Down
2 changes: 1 addition & 1 deletion rudder-web/src/main/webapp/secure/administration/apiManagement.html
View file
Open in desktop
Expand Up @@ -41,7 +41,7 @@
<div class="portlet" ng-app="accountManagement" id="accountManagement" >
<div class="portlet-content">
<div class="inner-portlet">
<div class="inner-portlet-header">Configure allowed accounts</div>
<div class="page-title">Configure allowed accounts</div>
<div class="portlet-content">

<div class="intro">
Expand Down
8 changes: 4 additions & 4 deletions rudder-web/src/main/webapp/secure/administration/databaseManagement.html
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@
<div class="lift:administration.DatabaseManagement.display">

<div class="inner-portlet">
<div class="inner-portlet-header">Active reports
<div class="page-title">Active reports
</div>
<div class="intro">
<div>
Expand Down Expand Up @@ -60,7 +60,7 @@
</div>

<div class="inner-portlet">
<div class="inner-portlet-header">Archived reports</div>
<div class="page-title">Archived reports</div>
<div class="intro">
<div>
Archived reports are stored in an SQL table without any indexes,
Expand Down Expand Up @@ -95,7 +95,7 @@
</div>

<div class="inner-portlet">
<div class="inner-portlet-header">Automatic report cleaning</div>
<div class="page-title">Automatic report cleaning</div>
<div class="inner-portlet-content">
<div class="intro">
<div>
Expand Down Expand Up @@ -137,7 +137,7 @@
</div>

<div class="inner-portlet">
<div class="inner-portlet-header">Manual report cleaning</div>
<div class="page-title">Manual report cleaning</div>
<div class="inner-portlet-content">
<div class="intro">
<div>
Expand Down
4 changes: 2 additions & 2 deletions rudder-web/src/main/webapp/secure/administration/pluginManagement.html
View file
Open in desktop
Expand Up @@ -6,13 +6,13 @@

<div class="portlet">
<div class="inner-portlet">
<div class="inner-portlet-header">Plugins</div>
<div class="page-title">Plugins</div>
<div class="intro">
<p>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).</p>
</div>
<div class="lift:administration.PluginManagement.display">
<div class="portlet">
<div class="inner-portlet-header">[Here comes the plugins name]</div>
<div class="page-title">[Here comes the plugins name]</div>
<div class="portlet-content">
<div class="deca">

Expand Down
20 changes: 10 additions & 10 deletions rudder-web/src/main/webapp/secure/administration/policyServerManagement.html
View file
Open in desktop
Expand Up @@ -40,7 +40,7 @@
<div class="portlet">
<div class="portlet-content">
<div class="inner-portlet">
<div class="inner-portlet-header">Client-server communication</div>
<div class="page-title">Client-server communication</div>
<div class="portlet-content">

<div class="intro">
Expand Down Expand Up @@ -125,7 +125,7 @@ <h3>Security</h3>
</div>

<div class="inner-portlet">
<div class="inner-portlet-header">Configure compliance mode</div>
<div class="page-title">Configure compliance mode</div>
<div class="portlet-content">

<div class="lift:administration.PropertiesManagement.complianceModeConfiguration" id="complianceModeForm">
Expand Down Expand Up @@ -155,7 +155,7 @@ <h3>Security</h3>


<div class="inner-portlet">
<div class="inner-portlet-header">Agent run schedule</div>
<div class="page-title">Agent run schedule</div>
<div class="portlet-content">

<div class="intro">
Expand Down Expand Up @@ -298,7 +298,7 @@ <h3>Security</h3>
</div>

<div class="inner-portlet">
<div class="inner-portlet-header">Configure change audit logs</div>
<div class="page-title">Configure change audit logs</div>
<div class="portlet-content">

<div class="lift:administration.PropertiesManagement.changeMessage" id="changeMessageForm">
Expand Down Expand Up @@ -335,7 +335,7 @@ <h3>Security</h3>


<div class="inner-portlet">
<div class="inner-portlet-header">Configure Change Requests (validation workflow)</div>
<div class="page-title">Configure Change Requests (validation workflow)</div>
<div class="portlet-content">


Expand Down Expand Up @@ -377,7 +377,7 @@ <h3>Security</h3>
</div>

<div class="inner-portlet">
<div class="inner-portlet-header">Configure file retention</div>
<div class="page-title">Configure file retention</div>
<div class="portlet-content">

<div class="intro">
Expand Down Expand Up @@ -415,7 +415,7 @@ <h3>Security</h3>
</div>

<div class="inner-portlet">
<div class="inner-portlet-header">Logging</div>
<div class="page-title">Logging</div>
<div class="portlet-content">

<div class="lift:administration.PropertiesManagement.loggingConfiguration" id="storeAllLogsForm">
Expand Down Expand Up @@ -445,7 +445,7 @@ <h3>Security</h3>
</div>

<div class="inner-portlet">
<div class="inner-portlet-header">Clear policy caches</div>
<div class="page-title">Clear policy caches</div>
<div class="portlet-content">

<div class="intro">
Expand Down Expand Up @@ -473,7 +473,7 @@ <h3>Security</h3>


<div class="inner-portlet">
<div class="inner-portlet-header">Manage dynamic groups</div>
<div class="page-title">Manage dynamic groups</div>
<div class="portlet-content">

<div class="intro">
Expand Down Expand Up @@ -501,7 +501,7 @@ <h3>Security</h3>
</div>

<div class="inner-portlet">
<div class="inner-portlet-header">Manage Technique library</div>
<div class="page-title">Manage Technique library</div>
<div class="portlet-content">

<div class="intro">
Expand Down
6 changes: 3 additions & 3 deletions rudder-web/src/main/webapp/secure/administration/techniqueLibraryManagement.html
View file
Open in desktop
Expand Up @@ -34,7 +34,7 @@
<div class="portlet-content">

<div class="inner-portlet">
<div class="inner-portlet-header">Technique library</div>
<div class="page-title">Technique library</div>
<div class="intro">
<lift:authz role="directive_read">
Only Techniques in the User library are available to create <a href="/secure/configurationManager/directiveManagement">new Directives</a>. Add new Techniques by Drag'n'droping them from Reference library to User library categories.
Expand All @@ -46,7 +46,7 @@
</div>
<div class="column">
<div class="inner-portlet">
<div class="inner-portlet-header">Reference Technique library</div>
<div class="page-title">Reference Technique library</div>
<div class="inner-portlet-content">
<div id="TechniquesLibraryTree_actions_zone" style="margin:10px;">
<span onclick="openAllNodes('#techniqueLibraryTree');"><img src="/images/open-plus.png" alt="Open all categories" title="Open all categories" width="16" height="16" style="float:none;margin:0px;vertical-align: bottom"/></span>
Expand Down Expand Up @@ -74,7 +74,7 @@
</div>
<div class="column">
<div class="inner-portlet">
<div class="inner-portlet-header">Active Techniques library</div>
<div class="page-title">Active Techniques library</div>
<div class="inner-portlet-content">
<div id="TechniquesLibraryTree_actions_zone" style="margin:10px;">
<span onclick="openAllNodes('#activeTechniquesTree');"><img src="/images/open-plus.png" alt="Open all categories" title="Open all categories" width="16" height="16" style="float:none;margin:0px;vertical-align: bottom"/></span>
Expand Down
4 changes: 2 additions & 2 deletions rudder-web/src/main/webapp/secure/configurationManager/directiveManagement.html
View file
Open in desktop
Expand Up @@ -73,7 +73,7 @@
<lift:configuration.DirectiveManagement.head />

<div class="col col-sm">
<div class="inner-portlet-header">Directive Library</div>
<div class="page-title">Directive Library</div>
<div id="activeTechniquesTree_actions_zone" style="margin:5px 0;">
<img onclick="openAllNodes('#activeTechniquesTree');" src="/images/open-plus.png" alt="+" width="16" height="16" class="filterIcon"/>

Expand All @@ -98,7 +98,7 @@

<lift:configuration.DirectiveManagement.techniqueDetails>
<div id="techniqueDetails" >
<div class="inner-portlet-header">Technique information</div>
<div class="page-title">Technique information</div>
<div id="details">
<div id="directiveIntro">
The Directive <b class="directive">[Directive]</b> is based on following Technique:
Expand Down
2 changes: 1 addition & 1 deletion rudder-web/src/main/webapp/secure/configurationManager/parameterManagement.html
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
<div class="portlet-content">
<div class="inner-portlet">
<lift:authz role="directive_read">
<div class="inner-portlet-header">List of Global Parameters</div>
<div class="page-title">List of Global Parameters</div>
<div class="intro">
<div>
<p>Here, you can create, update or delete Global Parameters.</p>
Expand Down
2 changes: 1 addition & 1 deletion rudder-web/src/main/webapp/secure/configurationManager/ruleManagement.html
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@
</div>
<hr class="spacer" />
<div id="editRuleZonePortlet" class="inner-portlet nodisplay">
<div class="inner-portlet-header">Rule details</div>
<div class="page-title">Rule details</div>
<div class="inner-portlet-content">
<lift:configuration.RuleManagement.editRule />
</div>
Expand Down
2 changes: 1 addition & 1 deletion rudder-web/src/main/webapp/secure/nodeManager/groups.html
View file
Open in desktop
Expand Up @@ -20,7 +20,7 @@
<div class="col col-sm">
<lift:node.Groups.groupHierarchy>
<div class="inner-portlet" style="float:left; margin-right:15px;">
<div class="inner-portlet-header">Group hierarchy</div>
<div class="page-title">Group hierarchy</div>
<div class="inner-portlet-content">
<div>
<lift:Authz role="group_write">
Expand Down
2 changes: 1 addition & 1 deletion rudder-web/src/main/webapp/secure/nodeManager/manageNewNode.html
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@

<div class="portlet">
<div class="inner-portlet">
<div class="inner-portlet-header">Accept new Nodes</div>
<div class="page-title">Accept new Nodes</div>
<div class="intro">
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.
</div>
Expand Down
2 changes: 1 addition & 1 deletion rudder-web/src/main/webapp/secure/nodeManager/nodes.html
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@
<div class="portlet">
<div class="portlet-content">
<div class="inner-portlet">
<div class="inner-portlet-header">Nodes</div>
<div class="page-title">Nodes</div>
<lift:node.Nodes.table />
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion rudder-web/src/main/webapp/secure/nodeManager/searchNodes.html
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@
</div>

<div class="inner-portlet">
<div class="inner-portlet-header">Query based search</div>
<div class="page-title">Query based search</div>
<div class="intro">
<div>
Find nodes in your Rudder infrastructure that match different criteria.<br />
Expand Down
8 changes: 4 additions & 4 deletions rudder-web/src/main/webapp/secure/utilities/archiveManagement.html
View file
Open in desktop
Expand Up @@ -48,7 +48,7 @@
<div class="portlet-content">

<div class="inner-portlet">
<div class="inner-portlet-header">Global archive</div>
<div class="page-title">Global archive</div>
<div class="portlet-content">
<div class="intro">
Archive or restore settings (Groups, Rules, Directives and active Techniques) from Rudder to backup, restore or transfer items between Rudder instances.
Expand Down Expand Up @@ -81,7 +81,7 @@
</div>

<div class="inner-portlet">
<div class="inner-portlet-header">Archive groups</div>
<div class="page-title">Archive groups</div>
<div class="portlet-content">

<div class="intro">
Expand Down Expand Up @@ -114,7 +114,7 @@
</div>

<div class="inner-portlet">
<div class="inner-portlet-header">Archive Rules</div>
<div class="page-title">Archive Rules</div>
<div class="portlet-content">

<div class="intro">
Expand Down Expand Up @@ -149,7 +149,7 @@
</div>

<div class="inner-portlet">
<div class="inner-portlet-header">Archive Directives and active Techniques</div>
<div class="page-title">Archive Directives and active Techniques</div>
<div class="portlet-content">

<div class="intro">
Expand Down
2 changes: 1 addition & 1 deletion rudder-web/src/main/webapp/secure/utilities/changeRequests.html
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@
<div class="portlet">
<div class="portlet-content">
<div class="inner-portlet">
<div class="inner-portlet-header">Change Requests</div>
<div class="page-title">Change Requests</div>
<div class="portlet-content">
<lift:lazy-load>
<div class="lift:administration.ChangeRequestManagement.filter" style="margin-top:10px;">
Expand Down
2 changes: 1 addition & 1 deletion rudder-web/src/main/webapp/secure/utilities/eventLogs.html
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@

<div class="portlet">
<div class="inner-portlet">
<div class="inner-portlet-header">Event Logs</div>
<div class="page-title">Event Logs</div>
<div class="portlet-content">
<hr class="spacer"/>

Expand Down