Browse Source

调整文件命名方式

James Iter 9 years ago
parent
commit
adb87de4d9

+ 1 - 1
docs/todo.md

@@ -17,7 +17,7 @@
 - [ ] 提示待做的启动作业
 - [ ] 加入 tag 功能
 - [ ] 收集存在于 JimV-N,却不存在于 JimV-C 的 Guest
-- [ ] 批量添加启动作业
+- [x] 批量添加启动作业
 - [ ] 单独写页面展现已有启动作业的虚拟机列表
 - [x] 磁盘页面,默认不显示系统盘,加 CheckBox 来控制
 - [x] 不显示系统级别的启动作业

+ 0 - 0
templates/boot_job_show.html → templates/boot_jobs_show.html


+ 0 - 0
templates/disk_show.html → templates/disks_show.html


+ 0 - 0
templates/guest_boot_job.html → templates/guest_boot_jobs.html


+ 0 - 0
templates/guest_show.html → templates/guests_show.html


+ 9 - 3
templates/layout.html

@@ -297,10 +297,16 @@
                     <ul id="sidebar-menu" data-spy="affix" data-offset-top="10">
                         <li class="header"><span>虚拟化平台管理</span></li>
                         <li>
-                            <a href="{{ url_for('v_guests.show') }}" title="虚拟机实例列表">
+                            <a href="#" title="虚拟机">
                                 <i class="glyph-icon icon-linecons-cloud"></i>
                                 <span>虚拟机</span>
                             </a>
+                            <div class="sidebar-submenu">
+                                <ul>
+                                    <li><a href="{{ url_for('v_guests.show') }}" title="虚拟机实例列表"><span>实例</span></a></li>
+                                    <li><a href="#" title="虚拟机启动作业列表"><span>启动作业</span></a></li>
+                                </ul>
+                            </div><!-- .sidebar-submenu -->
                         </li>
                         <li>
                             <a href="{{ url_for('v_disks.show') }}" title="磁盘实例列表">
@@ -309,7 +315,7 @@
                             </a>
                         </li>
                         <li>
-                            <a href="{{ url_for('v_guests.show') }}" title="宿主机列表">
+                            <a href="#" title="宿主机列表">
                                 <i class="glyph-icon icon-linecons-desktop"></i>
                                 <span>宿主机</span>
                             </a>
@@ -339,7 +345,7 @@
                             </div><!-- .sidebar-submenu -->
                         </li>
                         <li>
-                            <a href="{{ url_for('v_guests.show') }}" title="JimV 虚拟化平台系统配置">
+                            <a href="#" title="JimV 虚拟化平台系统配置">
                                 <i class="glyph-icon icon-linecons-cog"></i>
                                 <span>系统配置</span>
                             </a>

+ 0 - 0
templates/log.html → templates/logs.html


+ 0 - 0
templates/operate_rule_show.html → templates/operate_rules_show.html


+ 0 - 0
templates/os_template_show.html → templates/os_templates_show.html


+ 1 - 1
views/boot_job.py

@@ -98,7 +98,7 @@ def show():
             if i == last_page:
                 break
 
-    return render_template('boot_job_show.html', boot_jobs_ret=boot_jobs_ret,
+    return render_template('boot_jobs_show.html', boot_jobs_ret=boot_jobs_ret,
                            resource_path=resource_path,
                            page=page, page_size=page_size, keyword=keyword, pages=pages, order_by=order_by, order=order,
                            last_page=last_page)

+ 1 - 1
views/disk.py

@@ -135,7 +135,7 @@ def show():
             if i == last_page:
                 break
 
-    return render_template('disk_show.html', disks_ret=disks_ret, resource_path=resource_path, page=page,
+    return render_template('disks_show.html', disks_ret=disks_ret, resource_path=resource_path, page=page,
                            page_size=page_size, keyword=keyword, pages=pages, order_by=order_by, order=order,
                            last_page=last_page, show_area=show_area)
 

+ 2 - 2
views/guest.py

@@ -88,7 +88,7 @@ def show():
             if i == last_page:
                 break
 
-    return render_template('guest_show.html', guests_ret=guests_ret, resource_path=resource_path,
+    return render_template('guests_show.html', guests_ret=guests_ret, resource_path=resource_path,
                            os_templates_mapping_by_id=os_templates_mapping_by_id, page=page,
                            page_size=page_size, keyword=keyword, pages=pages, last_page=last_page)
 
@@ -218,6 +218,6 @@ def show_boot_job(uuid):
     for boot_job in boot_jobs_ret['data']:
         boot_jobs_mapping_by_id[boot_job['id']] = boot_job
 
-    return render_template('guest_boot_job.html', uuid=uuid, guest_ret=guest_ret,
+    return render_template('guest_boot_jobs.html', uuid=uuid, guest_ret=guest_ret,
                            guest_boot_jobs_ret=guest_boot_jobs_ret, boot_jobs_mapping_by_id=boot_jobs_mapping_by_id)
 

+ 1 - 1
views/log.py

@@ -84,7 +84,7 @@ def show():
             if i == last_page:
                 break
 
-    return render_template('log.html', logs_ret=logs_ret, resource_path=resource_path, page=page,
+    return render_template('logs.html', logs_ret=logs_ret, resource_path=resource_path, page=page,
                            page_size=page_size, keyword=keyword, pages=pages, order_by=order_by, order=order,
                            last_page=last_page)
 

+ 1 - 1
views/operate_rule.py

@@ -111,7 +111,7 @@ def show():
             if i == last_page:
                 break
 
-    return render_template('operate_rule_show.html', operate_rules_ret=operate_rules_ret,
+    return render_template('operate_rules_show.html', operate_rules_ret=operate_rules_ret,
                            boot_jobs_mapping_by_id=boot_jobs_mapping_by_id, resource_path=resource_path,
                            page=page, page_size=page_size, keyword=keyword, pages=pages, order_by=order_by, order=order,
                            last_page=last_page)

+ 1 - 1
views/os_template.py

@@ -104,7 +104,7 @@ def show():
             if i == last_page:
                 break
 
-    return render_template('os_template_show.html', os_templates_ret=os_templates_ret,
+    return render_template('os_templates_show.html', os_templates_ret=os_templates_ret,
                            boot_jobs_mapping_by_id=boot_jobs_mapping_by_id, resource_path=resource_path,
                            page=page, page_size=page_size, keyword=keyword, pages=pages, order_by=order_by, order=order,
                            last_page=last_page)