Revision 4f1968db

b/ui/static/main.css
5191 5191
    padding-right: 3%;
5192 5192
}
5193 5193

  
5194
.create-vm p.desc {
5195
    font-size: 0.9em;
5196
    color: #888;
5197
    margin-bottom: 10px;
5198
}
5199

  
5194 5200
.create-vm li.role .values .val:hover {
5195 5201
    background-color: #eee;
5196 5202
}
......
5490 5496
    float: left;
5491 5497
}
5492 5498

  
5499
.create-vm .vm-confirm .confirm-cont ul li .value {
5500
    float: right;
5501
    padding-top: 2px;
5502
    display: block;
5503
    width: 90px;
5504
    text-align: right;
5505
}
5506

  
5507
.create-vm .vm-confirm .confirm-cont ul li.image-description .value,
5508
.create-vm .vm-confirm .confirm-cont ul li.image-name .value {
5509
    float: none;
5510
    width: auto;
5511
    text-align:left;
5512
    width: auto;
5513
}
5514

  
5493 5515
.create-vm .vm-confirm .confirm-cont ul li {
5494 5516
    padding:0;
5495 5517
    margin:0;
5496 5518
    margin-bottom: 5px;
5497 5519
    border-bottom: 1px solid #EEE;
5498
    padding-bottom: 9px;
5520
    padding-bottom: 7px;
5499 5521
    margin-right: 10px;
5500 5522
}
5501 5523

  
......
5528 5550
}
5529 5551

  
5530 5552
.create-vm .confirm-cont .param {
5531
    margin-bottom: 10px !important;
5553
    margin-bottom: 7px !important;
5532 5554
}
5533 5555

  
5534 5556
.create-vm .confirm-cont .value {
b/ui/static/snf/js/ui/web/ui_create_view.js
592 592
                this.$(".confirm-cont.flavor .flavor-" + sel + " .value").text(val)
593 593
            }
594 594
            
595
            set_detail("cpu");
595
            set_detail("cpu", flavor.get("cpu") + "x");
596 596
            set_detail("ram", flavor.get("ram") + " MB");
597 597
            set_detail("disk", util.readablizeBytes(flavor.get("disk") * 1024 * 1024 * 1024));
598 598
        },
......
608 608
            
609 609
            set_detail("description");
610 610
            set_detail("name");
611
            set_detail("os", image.get("OS"));
611
            set_detail("os", _(image.get("OS")).capitalize());
612 612
            set_detail("gui", image.get("GUI"));
613 613
            set_detail("size", util.readablizeBytes(image.get_size() * 1024 * 1024));
614 614
            set_detail("kernel");
......
640 640
            this.confirm.find("li.mem .value").text(params.flavor.get("ram"));
641 641
            this.confirm.find("li.disk .value").text(params.flavor.get("disk"));
642 642

  
643
            if (!this.name_changed) {
643
            if (!this.name_changed && this.parent.visible()) {
644
                if (!$.browser.msie) {
645
                    this.$("#create-vm-name").select();
646
                } else {
647
                    window.setTimeout(_.bind(function(){
648
                        this.$("#create-vm-name").select();
649
                    }, this), 100)
650
                }
644 651
            }
645 652
            
646 653
            var img = snf.ui.helpers.os_icon_path(params.image.get("OS"))
b/ui/templates/partials/create_vm.html
150 150
                        <div class="confirm-cont image">
151 151
                            <h4>{% trans "Image" %}</h4>
152 152
                            <ul class="confirm-params">
153
                                <li class="param image-name">
153
                                <li class="param image-name clearfix">
154 154
                                    <h4 class="value"></h4>
155 155
                                </li>
156
                                <li class="param image-description">
156
                                <li class="param image-description clearfix">
157 157
                                    <span class="title">{% trans "Description" %}</span>
158 158
                                    <span class="value"></span>
159 159
                                </li>
160
                                <li class="param image-os">
160
                                <li class="param image-os clearfix">
161 161
                                    <span class="title">{% trans "OS" %}</span>
162 162
                                    <span class="value"></span>
163 163
                                </li>
164
                                <li class="param image-size">
164
                                <li class="param image-size clearfix">
165 165
                                    <span class="title">{% trans "Size" %}</span>
166 166
                                    <span class="value"></span>
167 167
                                </li>
168
                                <li class="param image-gui">
168
                                <li class="param image-gui clearfix">
169 169
                                    <span class="title">{% trans "GUI" %}</span>
170 170
                                    <span class="value"></span>
171 171
                                </li>
172
                                <li class="param image-kernel">
172
                                <li class="param image-kernel clearfix">
173 173
                                    <span class="title">{% trans "Kernel" %}</span>
174 174
                                    <span class="value"></span>
175 175
                                </li>
......
178 178
                        <div class="confirm-cont flavor">
179 179
                            <h4>{% trans "Flavor" %}</h4>
180 180
                            <ul class="confirm-params">
181
                                <li class="param flavor-cpu">
181
                                <li class="param flavor-cpu clearfix">
182 182
                                    <span class="title">{% trans "CPUs" %}</span>
183 183
                                    <span class="value"></span>
184 184
                                </li>
185
                                <li class="param flavor-ram">
185
                                <li class="param flavor-ram clearfix">
186 186
                                    <span class="title">{% trans "Memory" %}</span>
187 187
                                    <span class="value"></span>
188 188
                                </li>
189
                                <li class="param flavor-disk">
189
                                <li class="param flavor-disk clearfix">
190 190
                                    <span class="title">{% trans "Disk" %}</span>
191 191
                                    <span class="value"></span>
192 192
                                </li>
193 193
                            </ul>
194 194
                        </div>
195 195
                        <div class="confirm-cont meta">
196
                            <h4>{% trans "Machine tags" %}</h4>
196
                            <h4>{% trans "Suggested tags" %}</h4>
197 197
                            <ul class="confirm-params">
198 198
                                <li class="predefined-meta role">
199
                                    <p class="desc">
200
                                        You may change machine tags
201
                                        later from the machines view.
202
                                    </p>
199 203
                                    <span class="key">{% trans "Role" %}</span>
200 204
                                    <div class="values clearfix">
201 205
                                    </div>

Also available in: Unified diff