[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, debian/master, updated. 810edbdd3feedbfe37f4a65bee50b57b2f60fa2a

[Frescha]

The following commit has been merged in the debian/master branch:
commit 17aab37e85e1a31f5dfed6c9137892ed74b54130
Author: Frescha <frescha at unitedseed.de>
Date:   Wed Nov 16 19:24:02 2011 +0100

    Add new comment box to detailsite mockup

diff --git a/shinken/webui/plugins/eltdetail/htdocs/css/eltdetail2.css b/shinken/webui/plugins/eltdetail/htdocs/css/eltdetail2.css
index 20439d6..8cb5405 100755
--- a/shinken/webui/plugins/eltdetail/htdocs/css/eltdetail2.css
+++ b/shinken/webui/plugins/eltdetail/htdocs/css/eltdetail2.css
@@ -231,3 +231,80 @@ div.content {
 	vertical-align: -2px;
 	margin-left:2px;
 }
+
+/*
+ *  Comments
+ */
+
+.comment-text {
+	margin-bottom: 5px;
+	width: 100%;
+	
+}
+
+.comment-meta {
+	width: 100%;
+	color: #999999;
+}
+
+.comment-meta span{
+	margin-right:10px;
+}
+
+.comment-action a{
+	color: #e10000;
+	width: 5%;
+	text-decoration:none;
+	line-height: 35px;
+}
+
+.left {
+	float:left;
+}
+
+.right {
+	float:right;
+}
+#log_container {}
+
+#log_container  h2{
+    background: none repeat scroll 0 0 #E6F1F6;
+    border: 1px solid #E3E3E5;
+    border-top-left-radius: 4px;
+    border-top-right-radius: 4px;
+    color: #3A505B;
+    font-size: 13px;
+    margin: 15px 0 0;
+    padding: 5px 8px;
+    text-shadow: 0 1px #FFFFFF;
+}
+
+#log_container  ol {
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-color: -moz-use-text-color #E3E3E5 #E3E3E5;
+    border-right: 1px solid #E3E3E5;
+    border-style: none solid solid;
+    border-width: medium 1px 1px;
+    list-style-type: none;
+}
+
+#log_container  li {
+	background: #FAFAFA;
+    border-top: 1px solid #E3E3E5;
+    padding: 10px;
+	margin-left: 0px;
+    position: relative;
+	min-height:35px;
+}
+
+.row_alt {
+	background: #FFFFFF !important;
+}
+
+.icon_delete {
+    background: url("../../htdocs/images/icons/delete_64.png") no-repeat scroll transparent;
+    background-position: 4px;
+	padding-left: 24px;
+    background-size: 15px 15px;
+}
\ No newline at end of file
diff --git a/shinken/webui/plugins/eltdetail/views/eltdetail2.tpl b/shinken/webui/plugins/eltdetail/views/eltdetail2.tpl
index 51bc192..72fd65c 100644
--- a/shinken/webui/plugins/eltdetail/views/eltdetail2.tpl
+++ b/shinken/webui/plugins/eltdetail/views/eltdetail2.tpl
@@ -21,6 +21,7 @@ Invalid element name
 
 %rebase layout title=elt_type.capitalize() + ' detail about ' + elt.get_full_name(),  js=['eltdetail/js/switchbuttons.js', 'eltdetail/js/graphs.js','eltdetail/js/TabPane.js', 'eltdetail/js/gesture.js'],  css=['eltdetail/css/eltdetail2.css', 'eltdetail/css/gesture.css', 'eltdetail/css/switchbuttons.css'], top_right_banner_state=top_right_banner_state , user=user, app=app
 
+
 %#  "This is the background canvas for all gesture detection things " 
 <canvas id="canvas"></canvas>
 %# " We will save our element name so gesture functions will be able to call for the good elements."
@@ -28,7 +29,6 @@ Invalid element name
 
 %#  "Left Container Start"
 <div id="left_container" class="grid_3">
-  
 
 </div>
 %#  "Left Container End"
@@ -88,6 +88,10 @@ Invalid element name
 		    %end
 		</div>				
 	</div>
+	<!-- Switch Start-->
+
+    <!-- Switch End-->
+      
 		<div id="elt_container">
 
 		<script type="text/javascript">
@@ -285,29 +289,26 @@ Invalid element name
 												</li>
 											</ul>
 										</div>
-									  <div class="clear"></div>
-									%if len(elt.comments) > 0:
-									  <table>
-									    <tr>
-									      <td class="tdBorderLeft tdCriticity" style="width:30px;"><b>Author</b></td>
-									      <td class="tdBorderLeft tdCriticity" style="width:350px;"><b>Comment</b></td>
-									      <td class="tdBorderLeft tdCriticity" style="width:100px;"><b>Creation</b></td>
-									      <td class="tdBorderLeft tdCriticity" style="width:100px;"><b>Expire</b></td>
-									      <td class="tdBorderLeft tdCriticity" style="width:100px;"><b>Delete</b></td>
-									    </tr>
-									    %for c in elt.comments:
-									    <tr>
-									      <td class="tdBorderTop tdCriticity" >{{c.author}}</td>
-									      <td class="tdBorderTop tdBorderLeft tdBorderLeft tdCriticity" >{{c.comment}}</td>
-									      <td class="tdBorderTop tdBorderLeft tdCriticity">{{helper.print_date(c.entry_time)}}</td>
-									      <td class="tdBorderTop tdBorderLeft tdCriticity">{{helper.print_date(c.expire_time)}}</td>
-									      <td class="tdBorderTop tdBorderLeft tdCriticity"><a href="#" onclick="delete_comment('{{elt.get_full_name()}}', '{{c.id}}')"><img src="/static/images/delete.png"/></a></td>
-									    </tr>
-									    %end
-									  </table>
-									%else:
-									  <p>No comments available</p>
-									%end
+									  	<div class="clear"></div>
+									  
+									  	<div id="log_container" class="grid_16">
+											
+											%if len(elt.comments) > 0:
+											<ol>
+												%for c in elt.comments:
+												<li>
+													<div class="left">
+														<p class="comment-text">{{c.comment}}</p>
+														<div class="comment-meta"><span><b>Author:</b> {{c.author}}</span> <span><b>Creation:</b> {{helper.print_date(c.entry_time)}}</span> <span><b>Expire:</b>{{helper.print_date(c.expire_time)}}</span></div>
+													</div>
+													<div class="right comment-action"><a class="icon_delete" href="#">Delete</a></div>
+												</li>
+												%end
+											</ol>
+											%else:
+												<p>No comments available</p>
+											%end
+										</div>
 								</div>
 						    </div>
 						    <div class="content">

-- 
UNNAMED PROJECT