tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-29 16:54:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move css instructions to dedicated stylesheet

Browse Source 
refs #7163
This commit is contained in:
Johannes Meyer 2014-10-01 15:46:58 +02:00
parent 464fefa578
commit a980184eb9
5 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
application/views/scripts/form/setup-admin-account.phtml
View File

@ -10,11 +10,11 @@ $showRadioBoxes = strpos(strtolower(get_class($radioElem)), 'radio') !== false;
<?= $form->getElement('description'); ?> <?= $form->getElement('description'); ?>
<?php if (($byNameElem = $form->getElement('by_name')) !== null): ?> <?php if (($byNameElem = $form->getElement('by_name')) !== null): ?>
<div> <div>
<div style="display: inline-block; width: 30.2em;"> <div class="instructions">
<?= $byNameElem; ?> <?= $byNameElem; ?>
</div> </div>
<?php if ($showRadioBoxes): ?> <?php if ($showRadioBoxes): ?>
<div style="vertical-align: top; display: inline-block; padding: 0.4em 0.2em 0;"> <div class="radiobox">
<label> <label>
<input type="radio" name="user_type" value="by_name"> <input type="radio" name="user_type" value="by_name">
<?= $radioElem->getMultiOption('by_name'); ?> <?= $radioElem->getMultiOption('by_name'); ?>
@ -25,11 +25,11 @@ $showRadioBoxes = strpos(strtolower(get_class($radioElem)), 'radio') !== false;
<?php endif ?> <?php endif ?>
<?php if (($existingUserElem = $form->getElement('existing_user')) !== null): ?> <?php if (($existingUserElem = $form->getElement('existing_user')) !== null): ?>
<div> <div>
<div style="display: inline-block; width: 30.2em;"> <div class="instructions">
<?= $existingUserElem; ?> <?= $existingUserElem; ?>
</div> </div>
<?php if ($showRadioBoxes): ?> <?php if ($showRadioBoxes): ?>
<div style="vertical-align: top; display: inline-block; padding: 0.4em 0.2em 0;"> <div class="radiobox">
<label> <label>
<input type="radio" name="user_type" value="existing_user"> <input type="radio" name="user_type" value="existing_user">
<?= $radioElem->getMultiOption('existing_user'); ?> <?= $radioElem->getMultiOption('existing_user'); ?>
@ -40,13 +40,13 @@ $showRadioBoxes = strpos(strtolower(get_class($radioElem)), 'radio') !== false;
<?php endif ?> <?php endif ?>
<?php if (($newUserElem = $form->getElement('new_user')) !== null): ?> <?php if (($newUserElem = $form->getElement('new_user')) !== null): ?>
<div> <div>
<div style="display: inline-block; width: 30.2em;"> <div class="instructions">
<?= $newUserElem; ?> <?= $newUserElem; ?>
<?= $form->getElement('new_user_password'); ?> <?= $form->getElement('new_user_password'); ?>
<?= $form->getElement('new_user_2ndpass'); ?> <?= $form->getElement('new_user_2ndpass'); ?>
</div> </div>
<?php if ($showRadioBoxes): ?> <?php if ($showRadioBoxes): ?>
<div style="vertical-align: top; display: inline-block; padding: 0.4em 0.2em 0;"> <div class="radiobox">
<label> <label>
<input type="radio" name="user_type" value="new_user"> <input type="radio" name="user_type" value="new_user">
<?= $radioElem->getMultiOption('new_user'); ?> <?= $radioElem->getMultiOption('new_user'); ?>

6
application/views/scripts/form/setup-requirements.phtml
View File

@ -6,14 +6,14 @@ use Icinga\Web\Setup\Requirements;
$requirements = $form->getRequirements(); $requirements = $form->getRequirements();
?> ?>
<table> <table class="requirements">
<tbody> <tbody>
<?php foreach ($requirements as $requirement): ?> <?php foreach ($requirements as $requirement): ?>
<tr> <tr>
<td><?= $requirement->title; ?></td> <td><?= $requirement->title; ?></td>
<td><?= $requirement->description; ?></td> <td><?= $requirement->description; ?></td>
<td style="background-color: <?= $requirement->state === Requirements::STATE_OK ? 'green' : ( <td class="<?= $requirement->state === Requirements::STATE_OK ? 'fulfilled' : (
$requirement->state === Requirements::STATE_OPTIONAL ? 'yellow' : 'red' $requirement->state === Requirements::STATE_OPTIONAL ? 'not-available' : 'missing'
); ?>"><?= $requirement->message; ?></td> ); ?>"><?= $requirement->message; ?></td>
</tr> </tr>
<?php endforeach ?> <?php endforeach ?>

2
application/views/scripts/setup/wizard.phtml
View File

@ -1,3 +1,3 @@
<div class="container"> <div id="wizard" class="container">
<?= $wizard->getForm()->render(); ?> <?= $wizard->getForm()->render(); ?>
</div> </div>

1
library/Icinga/Web/StyleSheet.php
View File

@ -19,6 +19,7 @@ class StyleSheet
'css/icinga/main-content.less', 'css/icinga/main-content.less',
'css/icinga/tabs.less', 'css/icinga/tabs.less',
'css/icinga/forms.less', 'css/icinga/forms.less',
'css/icinga/wizard.less',
'css/icinga/widgets.less', 'css/icinga/widgets.less',
'css/icinga/pagination.less', 'css/icinga/pagination.less',
'css/icinga/monitoring-colors.less', 'css/icinga/monitoring-colors.less',

28
public/css/icinga/wizard.less Normal file
View File

@ -0,0 +1,28 @@
#wizard table.requirements {
td {
&.fulfilled {
background-color: lime;
}
&.not-available {
background-color: yellow;
}
&.missing {
background-color: red;
}
}
}
#setup_admin_account {
div.instructions {
width: 30.2em;
display: inline-block;
}
div.radiobox {
vertical-align: top;
display: inline-block;
padding: 0.4em 0.2em 0;
}
}