runner: monitoring link changed of place and explanations added

slapos/runner/templates/instanceInspect.html

@@ -20,6 +20,7 @@
       <li><a href="#tab2">Connection Information</a></li>
       <li><a href="#tab3" id="parameterTab">Parameters</a></li>
       <li><a href="#tab4" id="instancetabfiles">Partitions Content</a></li>
+      <li><a href="#tab5">Monitoring</a></li>
     </ul><!-- //Tab buttons -->
     <div class="tabDetails">
       <div id="tab1" class="tabContents">
@@ -132,6 +133,16 @@
         </h2>
       {%endif%}
         </div><!-- end tab4 -->
+      <div id="tab5" class="tabContents">
+        <h2>Monitoring interface</h2>
+        <div class="clear"></div>
+        <p>By clicking on the next link, you can access to the monitoring interface of the instance running inside the webrunner.</p>
+        <div class="clear"></div>
+        <p><b>Notice</b> that you have to extend the stack monitor in your software release (as explained <a href="http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/stack/monitor/README.txt?js=1">here</a>) for this weblink to work.
+        <div class="clear"></div>
+        <p><b><a href="{{ g.instance_monitoring_url }}" target="_blank">{{ g.instance_monitoring_url }}</a></b></p>
+        <div class="clear"></div>
+      </div><!-- end tab5 -->
     </div>
 </div>
 <!-- This contains the hidden content for inline calls -->

slapos/runner/templates/layout.html

@@ -81,7 +81,6 @@
             <li><a href="{{ url_for('inspectInstance') }}">Services</a></li>
             <li><a href="{{ url_for('viewLog') }}">Logs</a></li>
             <li><a href="{{ url_for('shell') }}">Terminal</a></li>
-            <li><a href="{{ g.instance_monitoring_url }}" target="_blank">Monitor</a></li>
             <li><a href="{{ url_for('manageRepository')}}#tab2">Git</a></li>
             <li class='right_menu main_menu'><a href="#"></a>
               <ul>