加入全屏功能

docs/todo.md

@@ -96,6 +96,6 @@
 - [ ] 在 About 页面，展现是否可以升级信息
 - [ ] 在 About 页面，加入更新功能
 - [ ] 大于 内存、负载 百分比后，禁止创建虚拟机
-- [ ] 考虑用 /etc/machine-id 替换 node_id
+- [x] 考虑用 /etc/machine-id 替换 node_id
 
 

jimvc/__init__.py

@@ -99,8 +99,7 @@ app.jinja_env.add_extension('jinja2.ext.loopcontrols')
 app.config['PERMANENT_SESSION_LIFETIME'] = timedelta(seconds=app_config['PERMANENT_SESSION_LIFETIME'])
 Session(app)
 Themes(app, app_identifier="JimV-C")
-l = packaged_themes_loader(app)
-pass
+themes_list = packaged_themes_loader(app)
 
 
 def instantiation_ws_vnc(listen_port, target_host, target_port):

jimvc/themes/default/static/js-init/widgets-init.js

@@ -136,7 +136,7 @@ var getUIColor = function (name) {
     } else {
         return mUIColors['default'];
     }
-}
+};
 
 /* Screenfull */
 
@@ -144,6 +144,18 @@ if(document.getElementById('fullscreen-btn')) {
   document.getElementById('fullscreen-btn').addEventListener('click', function () {
     if (screenfull.enabled) {
         screenfull.request();
+        $('#fullscreen-btn').hide();
+        $('#fullscreen-exit-btn').show();
     }
   });
 }
+
+if(document.getElementById('fullscreen-exit-btn')) {
+    document.getElementById('fullscreen-exit-btn').addEventListener('click', function () {
+        if (screenfull.enabled) {
+            screenfull.exit();
+            $('#fullscreen-exit-btn').hide();
+            $('#fullscreen-btn').show();
+        }
+    });
+}

jimvc/themes/default/templates/host_detail.html

@@ -1034,6 +1034,14 @@
                                 </span>
                             </td>
                         </tr>
+                        <tr>
+                            <td>
+                                <span class="guest-label">版本:&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                                <span class="guest-desc">
+                                {{ host.version }}
+                                </span>
+                            </td>
+                        </tr>
                         </tbody>
                     </table>
                 </div>

jimvc/themes/default/templates/hosts_show.html

@@ -141,6 +141,7 @@
                                 {% for mountpoint, disk in item.disks.iteritems() %}
                                     <li>挂载点: {{ mountpoint }} | {{ (disk.total / 1024 / 1024 / 1024) | int }} GB | 使用率: {{ disk.percent }}%</li>
                                 {% endfor %}
+                                <li>版本: {{ item.version }}</li>
                             </ul>
                         </div>
                     </div>

jimvc/themes/default/templates/layout.html

@@ -343,6 +343,12 @@
                 </div><!-- #header-nav-left -->
 
                 <div id="header-nav-right">
+                    <a href="#" class="header-btn" id="fullscreen-btn" title="全屏">
+                        <i class="glyph-icon icon-arrows-alt"></i>
+                    </a>
+                    <a href="#" class="header-btn" id="fullscreen-exit-btn" title="退出全屏" style="display: none;">
+                        <i class="glyph-icon icon-compress"></i>
+                    </a>
                     <a class="header-btn" id="logout-btn" href="#" title="安全退出" onclick="logout();">
                         <i class="glyph-icon icon-power-off"></i>
                     </a>
@@ -408,6 +414,12 @@
                                 <span>系统配置</span>
                             </a>
                         </li>
+                        <li>
+                            <a href="{{ url_for('v_config.show') }}" title="关于 JimV">
+                                <i class="glyph-icon icon-info"></i>
+                                <span>关于 JimV</span>
+                            </a>
+                        </li>
                     </ul><!-- #sidebar-menu -->
                 </div><!-- #scroll-sidebar -->
             </div><!-- #page-sidebar -->