Sunstone: add some icons, tips to Sunstone. Fix cache control.

install.sh

@@ -1269,7 +1269,11 @@ SUNSTONE_PUBLIC_IMAGES_FILES="src/sunstone/public/images/ajax-loader.gif \
                         src/sunstone/public/images/yellow_bullet.png \
                         src/sunstone/public/images/green_bullet.png \
                         src/sunstone/public/images/vnc_off.png \
-                        src/sunstone/public/images/vnc_on.png"
+                        src/sunstone/public/images/vnc_on.png \
+                        src/sunstone/public/images/network_icon.png \
+                        src/sunstone/public/images/system_icon.png \
+                        src/sunstone/public/images/server_icon.png \
+"
 
 SUNSTONE_PUBLIC_LOCALE_EN_US="\
 src/sunstone/public/locale/en_US/en_US.js \

src/sunstone/public/css/application.css

@@ -241,6 +241,10 @@ label{
     text-align:left;
 }
 
+.dataTables_wrapper {
+    min-height: 0;
+}
+
 .dataTables_wrapper label {
     float: none;
     width: auto;
@@ -345,10 +349,12 @@ tr.odd td, tr.even td{
 
 tr.odd:hover{
     background-color: #E69138 !important;
+    cursor: pointer;
 }
 
 tr.even:hover{
     background-color: #E69138 !important;
+    cursor: pointer;
 }
 
 .show_hide label{
@@ -607,3 +613,10 @@ ul.action_list li a:hover{
     padding: 5px;
     font-size: 1em;
 }
+
+.legend {
+    color: #636663;
+    margin-left: 10px;
+    margin-top: 5px;
+    font-style: italic;
+}

src/sunstone/public/js/plugins/acls-tab.js

@@ -38,6 +38,9 @@ var acls_tab_content = '\
   <tbody id="tbodyaclss">\
   </tbody>\
 </table>\
+<p class="legend">\
+'+tr("This table shows the ACLs rules broken down to easier the reading and meaning of each one. You can show the ACL original string by clicking on Show/Hide columns.")+'\
+</p>\
 </form>';
 
 var create_acl_tmpl =

src/sunstone/public/js/plugins/config-tab.js

@@ -45,9 +45,13 @@ var config_tab_content =
 \
         </div>\
       </div>\
+      <p class="legend">\
+'+tr("These options are stored in your OpenNebula user template.")+'\
+      </p>\
     </td>\
   </tr>\
-</table></form>';
+</table>\
+</form>';
 
 var config_actions = {
     "Config.list" : {

src/sunstone/public/js/plugins/groups-tab.js

@@ -35,6 +35,9 @@ var groups_tab_content = '\
   <tbody id="tbodygroups">\
   </tbody>\
 </table>\
+<p class="legend">\
+'+tr("Tip: Refresh the list if it only shows user ids in the user column.")+'\
+</p>\
 </form>';
 
 var create_group_tmpl =

src/sunstone/public/js/plugins/hosts-tab.js

@@ -57,6 +57,15 @@ var hosts_tab_content = '\
   <tbody id="tbodyhosts">\
   </tbody>\
 </table>\
+<p class="legend">\
+'+tr("CPU Use is calculated as the maximum between (total CPU - real CPU usage) and (allocated CPU). Real CPU usage is provided by the hosts monitoring driver. Available CPU is calculated using the information from the CPU setting of the VMs running on that host (allocated CPU)")+'\
+</p>\
+<p class="legend">\
+'+tr("Memory use is calculated according to the information provided by the host monitoring driver.")+'\
+</p>\
+<p class="legend">\
+'+tr("You can get monitoring graphs by clicking in the desired host and visiting the monitoring information tab. Note that oneacctd must be running for this information to be updated/available.")+'\
+</p>\
 </form>';
 
 var create_host_tmpl =

src/sunstone/public/js/plugins/images-tab.js

@@ -41,6 +41,9 @@ var images_tab_content = '\
   <tbody id="tbodyimages">\
   </tbody>\
 </table>\
+<p class="legend">\
+'+tr("Size and registration time are hidden colums. Note that persistent images can only be used by 1 VM. To change image datastore, please re-register the image.")+'\
+</p>\
 </form>';
 
 var create_image_tmpl =

src/sunstone/public/js/plugins/infra-tab.js

@@ -72,12 +72,13 @@ var infra_tab_content =
       <div class="panel">\
         <h3>' + tr("Infrastructure resources") + '</h3>\
         <div class="panel_info">\
-            <p>'+tr("The Infrastructure menu allows management of Hosts, Datastores, Virtual Networks. Users in the oneadmin group can manage clusters as well.")+'</p>\
+            <p><img src="images/network_icon.png" style="float:right;" alt="network icon"/>'+tr("The Infrastructure menu allows management of Hosts, Datastores, Virtual Networks. Users in the oneadmin group can manage clusters as well.")+'</p>\
             <p>'+tr("You can find further information on the following links:")+'</p>\
             <ul>\
                <li><a href="http://opennebula.org/documentation:rel3.4:hostsubsystem" target="_blank">Host subsystem</a></li>\
                <li><a href="http://opennebula.org/documentation:rel3.4:host_guide" target="_blank">Managing Hosts</a></li>\
                <li><a href="http://opennebula.org/documentation:rel3.4:nm" target="_blank">Networking subsystem</a></li>\
+               <li><a href="http://opennebula.org/documentation:rel3.4:cluster_guide" target="_blank">Managing Clusters</a></li>\
             </ul>\
         </div>\
       </div>\

src/sunstone/public/js/plugins/system-tab.js

@@ -67,7 +67,7 @@ var system_tab_content =
       <div class="panel">\
         <h3>' + tr("System Resources") + '</h3>\
         <div class="panel_info">\
-            <p>'+tr("System resources management is only accesible to users of the oneadmin group. It comprises the operations regarding OpenNebula groups, users and ACLs.")+'</p>\
+            <p><img src="images/system_icon.png" style="float:right;" alt="user" width="128" height="128" />'+tr("System resources management is only accesible to users of the oneadmin group. It comprises the operations regarding OpenNebula groups, users and ACLs.")+'</p>\
             <p>'+tr("You can find further information on the following links:")+'</p>\
             <ul>\
                <li><a href="http://opennebula.org/documentation:rel3.4:auth_overview" target="_blank">Users & Groups subsystem</a></li>\

src/sunstone/public/js/plugins/users-tab.js

@@ -39,6 +39,11 @@ var users_tab_content = '\
   <tbody id="tbodyusers">\
   </tbody>\
 </table>\
+<p class="legend">\
+<!--'+
+    tr("Tip: select Core authentication for new Sunstone/Self-Service regular users.")+
+'-->\
+</p>\
 </form>';
 
 var create_user_tmpl =
@@ -54,8 +59,6 @@ var create_user_tmpl =
                      <option value="core" selected="selected">'+tr("Core")+'</option>\
                      <option value="ssh">'+tr("SSH")+'</option>\
                      <option value="x509">'+tr("x509")+'</option>\
-                     <option value="server_cipher">'+tr("Server (Cipher)")+'</option>\
-                     <option value="server_x509">'+tr("Server (x509)")+'</option>\
                      <option value="public">'+tr("Public")+'</option>\
                 </select>\
         </div>\
@@ -272,8 +275,6 @@ var user_buttons = {
             return   '<option value="core" selected="selected">'+tr("Core")+'</option>\
                      <option value="ssh">'+tr("SSH")+'</option>\
                      <option value="x509">'+tr("x509")+'</option>\
-                     <option value="server_cipher">'+tr("Server (Cipher)")+'</option>\
-                     <option value="server_x509">'+tr("Server (x509)")+'</option>\
                      <option value="public">'+tr("Public")+'</option>'
         },
         tip: tr("Please choose the new type of authentication for the selected users")+":"

src/sunstone/public/js/plugins/vms-tab.js

@@ -72,6 +72,12 @@ var vms_tab_content = '\
   <tbody id="tbodyvmachines">\
   </tbody>\
 </table>\
+<p class="legend">\
+'+tr("CPU, Memory and Start time are hidden columns by default. You can get monitoring graphs by clicking on the desired VM and visiting the monitoring information tab (oneacctd needs to be running for this information to be up to date)")+'\
+</p>\
+<p class="legend">\
+'+tr("VNC console requires previous install of the noVNC addon. Check Sunstone documentation for more information.")+'\
+</p>\
 </form>';
 
 var create_vm_tmpl ='<form id="create_vm_form" action="">\

src/sunstone/public/js/plugins/vnets-tab.js

@@ -38,6 +38,9 @@ var vnets_tab_content = '\
   <tbody id="tbodyvnetworks">\
   </tbody>\
 </table>\
+<p class="legend">\
+'+tr("Tip: edit the leases of a network by clicking on one and going to the lease management tab.")+'\
+</p>\
 </form>';
 
 var create_vn_tmpl =

src/sunstone/public/js/plugins/vresources-tab.js

@@ -76,7 +76,8 @@ var vres_tab_content =
       <div class="panel">\
         <h3>' + tr("Virtual Resources") + '</h3>\
         <div class="panel_info">\
-            <p>'+tr("The Virtual Resources menu allows management of Virtual Machine Templates, Instances and Images.")+'</p>\
+            <p><img src="images/server_icon.png" alt="server" width="128" height="128" style="float:right;" />'+tr("The Virtual Resources menu allows management of Virtual Machine Templates, Instances and storage (Images).")+'</p>\
+            <p>'+tr("Virtual Machine templates can be instantiated as many times as you want. You can do it from the Templates tab or by creating a new VM in the VM tab. The second method allows you to customize the name and the number of VMs you want to launch.")+'</p>\
             <p>'+tr("You can find further information on the following links:")+'</p>\
             <ul>\
                <li><a href="http://opennebula.org/documentation:rel3.4:vm_guide" target="_blank">Creating Virtual Machines</a></li>\

src/sunstone/sunstone-server.rb

@@ -171,7 +171,7 @@ helpers do
 end
 
 before do
-    cache_control :private, :must_revalidate, :max_age => 600
+    cache_control :private, :must_revalidate
     unless request.path=='/login' || request.path=='/'
         halt 401 unless authorized?