Browse Source

- Latest "Notifications" admin page.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@262 a333f486-631f-4898-b8df-5754b55c2be0
dflaven 15 years ago
parent
commit
47850491f2
1 changed files with 11 additions and 8 deletions
  1. 11 8
      setup/data/structure/1.menus.xml

+ 11 - 8
setup/data/structure/1.menus.xml

@@ -954,7 +954,7 @@ display: list-item;
 <h1>Configuration of the <span class="hilite">Notifications</span></h1>
 </div>
 <itoptoggle name="Help" open="true">
-<div style="padding: 1em; font-size:1.25em;background: #E8F3CF;margin-top: 0.25em;">
+<div style="padding: 1em; font-size:1.25em;background:#E8F3CF;margin-top: 0.25em;">
 <img src="../images/bell.png" style="margin-top: -60px; margin-right: 10px; float: right;">
 <p>In iTop the notifications are fully customizable. They are based on two sets of objects: <i>triggers and actions</i>.</p>
 <p><i><b>Triggers</b></i> define when a notification will be executed. There are 3 types of triggers for covering 3 differents phases of an object life cycle:
@@ -976,14 +976,18 @@ When associated with a trigger, each action is given an 'order' number
 <itoptabs>
 	<itoptab name="Triggers">
 		<h3>Available Triggers</h3>
-		<table>
+		<table style="border:0;border-spacing:10px;width:100%;">
 		<tr>
-		<td style="vertical-align:top;width:50%;padding:1em;">
-		<h4>When entering a state</h4>
+		<td style="vertical-align:top;width:33%;padding:10px;background:#f8f8f8;">
+		<h4>When an object is created</h4>
+		<itopblock BlockClass="DisplayBlock" type="list" asynchronous="false" encoding="text/oql">SELECT TriggerOnObjectCreate</itopblock>
+		</td>
+		<td style="vertical-align:top;width:33%;padding:10px;background:#f8f8f8;">
+		<h4>When an object enters a state</h4>
 		<itopblock BlockClass="DisplayBlock" type="list" asynchronous="false" encoding="text/oql">SELECT TriggerOnStateEnter</itopblock>
 		</td>
-		<td style="vertical-align:top;width:50%;padding:1em;">
-		<h4>When leaving a state</h4>
+		<td style="vertical-align:top;width:33%;padding:10px;background:#f8f8f8;">
+		<h4>When an object leaves a state</h4>
 		<itopblock BlockClass="DisplayBlock" type="list" asynchronous="false" encoding="text/oql">SELECT TriggerOnStateLeave</itopblock>
 		</td>
 		</tr>
@@ -993,8 +997,7 @@ When associated with a trigger, each action is given an 'order' number
 		<h3>Available Actions</h3>
 		<itopblock BlockClass="DisplayBlock" type="list" asynchronous="false" encoding="text/oql">SELECT ActionEmail</itopblock>
 	</itoptab>
-</itoptabs>
-</template>
+&lt;/itoptabs&gt;</template>
 <type>administrator</type>
 <rank>2</rank>
 <parent_id>1</parent_id>