opennebula.diff

Alexey Medvedchikov, 08/01/2013 02:02 PM

Download (4.45 KB)

View differences:

/etc/one/sunstone-views/admin.yaml 2013-08-01 20:45:27.515279944 +0700
179 179
            network: true
180 180
            os_booting: true
181 181
            features: true
182
            raw: true
182 183
            input_output: true
183 184
            context: true
184 185
            scheduling: true
185
-- /etc/one/sunstone-views/cloud.yaml.orig	2013-08-01 20:42:03.915281947 +0700
186
++ /etc/one/sunstone-views/cloud.yaml	2013-08-01 20:42:45.111281541 +0700
......
181 181
            os_booting: true
182 182
            features: true
183 183
            input_output: true
184
            raw: true
184 185
            context: true
185 186
            scheduling: false
186 187
    images-tab:
187
-- /etc/one/sunstone-views/user.yaml.orig	2013-08-01 20:45:33.055279888 +0700
188
++ /etc/one/sunstone-views/user.yaml	2013-08-01 20:45:52.739279694 +0700
......
180 180
            network: true
181 181
            os_booting: true
182 182
            features: true
183
            raw: true
183 184
            input_output: true
184 185
            context: true
185 186
            scheduling: false
186
-- /etc/one/sunstone-views/vdcadmin.yaml.orig	2013-08-01 20:45:37.415279845 +0700
187
++ /etc/one/sunstone-views/vdcadmin.yaml	2013-08-01 20:46:05.543279568 +0700
......
180 180
            network: true
181 181
            os_booting: true
182 182
            features: true
183
            raw: true
183 184
            input_output: true
184 185
            context: true
185 186
            scheduling: false
186
-- /usr/lib/one/sunstone/public/js/plugins/templates-tab.js.orig	2013-08-01 17:04:04.951410678 +0700
187
++ /usr/lib/one/sunstone/public/js/plugins/templates-tab.js	2013-08-01 20:41:41.203282170 +0700
......
2888 2888
        });
2889 2889
    }
2890 2890

  
2891
    /**************************************************************************
2892
        RAW TAB
2893

  
2894
    **************************************************************************/
2895

  
2896
    var add_rawTab = function() {
2897
      var html_tab_content = '<li id="rawTab" class="wizard_tab">'+
2898
        '<form>'+
2899
          '<div class="row">'+
2900
            '<fieldset>'+
2901
              '<legend>'+tr("RAW data")+'</legend>'+
2902
                '<div>'+
2903
                  '<label class="inline" for="raw_type">'+tr("TYPE")+':</label>'+
2904
                  '<input type="text" id="raw_type" name="raw_type" />'+
2905
                '</div>'+
2906
                '<div>'+
2907
                  '<label class="inline" for="raw_data">'+tr("DATA")+':</label>'+
2908
                  '<input type="text" id="raw_data" name="raw_data" />'+
2909
                '</div>'+
2910
                '<div>'+
2911
                  '<label class="inline" for="raw_data_vmx">'+tr("DATA_VMX")+':</label>'+
2912
                  '<input type="text" id="raw_data_vmx" name="raw_data_vmx" />'+
2913
                '</div>'+
2914
            '</fieldset>'+
2915
          '</div>'+
2916
        '</form>'+
2917
      '</li>'
2918

  
2919
        $("<dd><a href='#raw'>RAW</a></dd>").appendTo($("dl#template_create_tabs"));
2920
        $(html_tab_content).appendTo($("ul#template_create_tabs_content"));
2921

  
2922
    }
2923

  
2924

  
2891 2925

  
2892 2926
    /**************************************************************************
2893 2927
        INPUT/OUTPUT TAB
......
3747 3781
      add_ioTab();
3748 3782
    }
3749 3783

  
3784
    if (Config.isTemplateCreationTabEnabled('raw')){
3785
      add_rawTab();
3786
    }
3787

  
3750 3788
    if (Config.isTemplateCreationTabEnabled('context')){
3751 3789
      add_contextTab();
3752 3790
    }
......
3862 3900
        addSectionJSON(vm_json["GRAPHICS"],$('li#ioTab .graphics',dialog));
3863 3901

  
3864 3902
        //
3903
        // RAW
3904
        //
3905
        function addslashes( str ) {
3906
          return (str + '').replace(/[\\"']/g, '\\$&').replace(/\u0000/g, '\\0');
3907
        }
3908

  
3909
        vm_json["RAW"] = {}
3910
        t = addslashes($('input#raw_type').val());
3911
        if (t) { vm_json["RAW"]['TYPE'] = t; }
3912
        t = addslashes($('input#raw_data').val());
3913
        if (t) { vm_json["RAW"]['DATA'] = t; }
3914
        t = addslashes($('input#raw_data_vmx').val());
3915
        if (t) { vm_json["RAW"]['DATA_VMX'] = t; }
3916

  
3917
        //
3865 3918
        // INPUT
3866 3919
        //
3867 3920

  
......
4350 4403
    }
4351 4404

  
4352 4405
    //
4406
    // RAW
4407
    //
4408

  
4409
    var raw = template.RAW;
4410
    var raw_section = $('li#rawTab', $create_template_dialog);
4411

  
4412
    if (raw) {
4413
        function htmlDecode(value){
4414
          return $('<div/>').html(value).text();
4415
        }
4416

  
4417
        $('input#raw_type').val(htmlDecode(raw['TYPE']));
4418
        $('input#raw_data').val(htmlDecode(raw['DATA']));
4419
        $('input#raw_data_vmx').val(htmlDecode(raw['DATA_VMX']));
4420
    }
4421

  
4422
    //
4353 4423
    // INPUT/OUTPUT
4354 4424
    //
4355 4425