diff --git a/vasl_templates/webapp/static/css/main.css b/vasl_templates/webapp/static/css/main.css index cf584ee..f52ace3 100644 --- a/vasl_templates/webapp/static/css/main.css +++ b/vasl_templates/webapp/static/css/main.css @@ -14,9 +14,8 @@ label { height: 1.25em ; margin-top: -3px ; } #menu { position: absolute ; top: 15px ; right: 8px ; z-index: 1 ; } #menu input[type='image'] { height: 30px ; } -.PopMenu-Item { width: 12em ; } -.PopMenu-Item a { padding: 5px 10px 5px 10px ; } -.PopMenu-Icon { display: none ; } +.PopMenu-Item { width: 14em ; } +.PopMenu-Item a { padding: 5px 10px 5px 30px ; } #alt-webapp-base-url { position: absolute ; top: 30px ; right: 110px ; font-size: 80% ; font-style: italic ; color: #cc0000 ; diff --git a/vasl_templates/webapp/static/images/menu/analyze-vsav.png b/vasl_templates/webapp/static/images/menu/analyze-vsav.png new file mode 100644 index 0000000..2768f49 Binary files /dev/null and b/vasl_templates/webapp/static/images/menu/analyze-vsav.png differ diff --git a/vasl_templates/webapp/static/images/menu/help.png b/vasl_templates/webapp/static/images/menu/help.png new file mode 100644 index 0000000..7802b9c Binary files /dev/null and b/vasl_templates/webapp/static/images/menu/help.png differ diff --git a/vasl_templates/webapp/static/images/menu/lfa.png b/vasl_templates/webapp/static/images/menu/lfa.png new file mode 100644 index 0000000..c1bd3a2 Binary files /dev/null and b/vasl_templates/webapp/static/images/menu/lfa.png differ diff --git a/vasl_templates/webapp/static/images/menu/new.png b/vasl_templates/webapp/static/images/menu/new.png new file mode 100644 index 0000000..870c36d Binary files /dev/null and b/vasl_templates/webapp/static/images/menu/new.png differ diff --git a/vasl_templates/webapp/static/images/menu/open.png b/vasl_templates/webapp/static/images/menu/open.png new file mode 100644 index 0000000..ad74594 Binary files /dev/null and b/vasl_templates/webapp/static/images/menu/open.png differ diff --git a/vasl_templates/webapp/static/images/menu/save.png b/vasl_templates/webapp/static/images/menu/save.png new file mode 100644 index 0000000..972a8e6 Binary files /dev/null and b/vasl_templates/webapp/static/images/menu/save.png differ diff --git a/vasl_templates/webapp/static/images/menu/settings.png b/vasl_templates/webapp/static/images/menu/settings.png new file mode 100644 index 0000000..8f4eeb7 Binary files /dev/null and b/vasl_templates/webapp/static/images/menu/settings.png differ diff --git a/vasl_templates/webapp/static/images/menu/template-pack.png b/vasl_templates/webapp/static/images/menu/template-pack.png new file mode 100644 index 0000000..f348604 Binary files /dev/null and b/vasl_templates/webapp/static/images/menu/template-pack.png differ diff --git a/vasl_templates/webapp/static/images/menu/update-vsav.png b/vasl_templates/webapp/static/images/menu/update-vsav.png new file mode 100644 index 0000000..e4cdd6e Binary files /dev/null and b/vasl_templates/webapp/static/images/menu/update-vsav.png differ diff --git a/vasl_templates/webapp/static/main.js b/vasl_templates/webapp/static/main.js index 602366d..7c528db 100644 --- a/vasl_templates/webapp/static/main.js +++ b/vasl_templates/webapp/static/main.js @@ -49,19 +49,20 @@ $(document).ready( function () { // initialize the menu var $menu = $("#menu input") ; + var imagesDir = gImagesBaseUrl + "/menu" ; $menu.popmenu( { - new_scenario: { label: "New scenario", action: function() { on_new_scenario() ; } }, - load_scenario: { label: "Load scenario", action: on_load_scenario }, - save_scenario: { label: "Save scenario", action: on_save_scenario }, + new_scenario: { label: "New scenario", icon: imagesDir+"/new.png", action: on_new_scenario }, + load_scenario: { label: "Load scenario", icon: imagesDir+"/open.png", action: on_load_scenario }, + save_scenario: { label: "Save scenario", icon: imagesDir+"/save.png", action: on_save_scenario }, separator: { type: "separator" }, - analyze_vsav: { label: "Analyze VASL scenario", action: on_analyze_vsav }, - update_vsav: { label: "Update VASL scenario", action: on_update_vsav }, - analyze_vlog: { label: "Analyze log files", action: on_analyze_vlog }, + analyze_vsav: { label: "Analyze VASL scenario", icon: imagesDir+"/analyze-vsav.png", action: on_analyze_vsav }, + update_vsav: { label: "Update VASL scenario", icon: imagesDir+"/update-vsav.png", action: on_update_vsav }, + analyze_vlog: { label: "Analyze log files", icon: imagesDir+"/lfa.png", action: on_analyze_vlog }, separator2: { type: "separator" }, - template_pack: { label: "Load template pack", action: on_template_pack }, - user_settings: { label: "Settings", action: user_settings }, + template_pack: { label: "Load template pack", icon: imagesDir+"/template-pack.png", action: on_template_pack }, + user_settings: { label: "Settings", icon: imagesDir+"/settings.png", action: user_settings }, separator3: { type: "separator" }, - show_help: { label: "Help", action: show_help }, + show_help: { label: "Help", icon: imagesDir+"/help.png", action: show_help }, } ) ; // nb: we only show the popmenu on left click (not the normal right-click) $menu.off( "contextmenu" ) ;