Revision cbcb2e4c

View differences:

install.sh
302 302
               $SUNSTONE_LOCATION/public/vendor/4.0/jgrowl \
303 303
               $SUNSTONE_LOCATION/public/vendor/4.0/foundation \
304 304
               $SUNSTONE_LOCATION/public/vendor/4.0/nouislider \
305
               $SUNSTONE_LOCATION/public/vendor/4.0/jdpicker_1.1 \
306
               $SUNSTONE_LOCATION/public/vendor/4.0/jdpicker_1.1/images \
305 307
               $SUNSTONE_LOCATION/public/vendor/4.0/datetimepicker \
306 308
               $SUNSTONE_LOCATION/public/images \
307 309
               $SUNSTONE_LOCATION/views"
......
496 498
    SUNSTONE_PUBLIC_NEW_VENDOR_FONTAWESOME_FONT:$SUNSTONE_LOCATION/public/vendor/4.0/fontawesome/font
497 499
    SUNSTONE_PUBLIC_NEW_VENDOR_FONTAWESOME_CSS:$SUNSTONE_LOCATION/public/vendor/4.0/fontawesome/css
498 500
    SUNSTONE_PUBLIC_NEW_VENDOR_NOUISLIDER:$SUNSTONE_LOCATION/public/vendor/4.0/nouislider
501
    SUNSTONE_PUBLIC_NEW_VENDOR_JDPICKER:$SUNSTONE_LOCATION/public/vendor/4.0/jdpicker_1.1
502
    SUNSTONE_PUBLIC_NEW_VENDOR_JDPICKER_IMAGES:$SUNSTONE_LOCATION/public/vendor/4.0/jdpicker_1.1/images
503
    SUNSTONE_PUBLIC_NEW_VENDOR_TIMEPICKER:$SUNSTONE_LOCATION/public/vendor/4.0/
499 504
    SUNSTONE_PUBLIC_NEW_VENDOR_DATETIMEPICKER:$SUNSTONE_LOCATION/public/vendor/4.0/datetimepicker    
500 505
    SUNSTONE_PUBLIC_IMAGES_FILES:$SUNSTONE_LOCATION/public/images
501 506
    SUNSTONE_PUBLIC_LOCALE_CA:$SUNSTONE_LOCATION/public/locale/ca
......
1489 1494
                src/sunstone/public/vendor/4.0/nouislider/jquery.nouislider.min.js \
1490 1495
                src/sunstone/public/vendor/4.0/nouislider/nouislider.css"
1491 1496

  
1497
SUNSTONE_PUBLIC_NEW_VENDOR_JDPICKER="\
1498
                src/sunstone/public/vendor/4.0/jdpicker_1.1/jdpicker.css \
1499
                src/sunstone/public/vendor/4.0/jdpicker_1.1/jquery.jdpicker.js"
1500

  
1501
SUNSTONE_PUBLIC_NEW_VENDOR_JDPICKER_IMAGES="\
1502
                src/sunstone/public/vendor/4.0/jdpicker_1.1/images/bg_hover.png \
1503
                src/sunstone/public/vendor/4.0/jdpicker_1.1/images/bg_selectable.png \
1504
                src/sunstone/public/vendor/4.0/jdpicker_1.1/images/bg_selected.png"
1505

  
1506
SUNSTONE_PUBLIC_NEW_VENDOR_TIMEPICKER="src/sunstone/public/vendor/4.0/jquery.timePicker.min.js"
1507

  
1492 1508
SUNSTONE_PUBLIC_NEW_VENDOR_DATETIMEPICKER="\
1493 1509
                src/sunstone/public/vendor/4.0/datetimepicker/LICENSE.txt \
1494 1510
                src/sunstone/public/vendor/4.0/datetimepicker/README.md \
src/sunstone/public/css/app.css
6797 6797
  overflow-x: hidden;
6798 6798
  padding: 5px;
6799 6799
}
6800

  
6801
/* line 741, ../sass/app.scss */
6802
div.time-picker {
6803
  position: absolute;
6804
  height: 191px;
6805
  width: 4em;
6806
  /* needed for IE */
6807
  overflow: auto;
6808
  background: #fff;
6809
  border: 1px solid #aaa;
6810
  z-index: 99;
6811
  margin: 0;
6812
}
6813

  
6814
/* line 751, ../sass/app.scss */
6815
div.time-picker-12hours {
6816
  width: 6em;
6817
  /* needed for IE */
6818
}
6819

  
6820
/* line 755, ../sass/app.scss */
6821
div.time-picker ul {
6822
  list-style-type: none;
6823
  margin: 0;
6824
  padding: 0;
6825
}
6826

  
6827
/* line 760, ../sass/app.scss */
6828
div.time-picker li {
6829
  cursor: pointer;
6830
  height: 20px;
6831
  font: 12px/1 Helvetica, Arial, sans-serif;
6832
  padding: 4px 3px;
6833
}
6834

  
6835
/* line 766, ../sass/app.scss */
6836
div.time-picker li.selected {
6837
  background: #0063CE;
6838
  color: #fff;
6839
}
6840

  
6841
/* line 772, ../sass/app.scss */
6842
.timepicker {
6843
  float: left;
6844
  width: 50px !important;
6845
}
6846

  
6847
/* line 777, ../sass/app.scss */
6848
.jdpicker {
6849
  float: left;
6850
  width: 90px !important;
6851
}
6852

  
6853
/* line 782, ../sass/app.scss */
6854
.columns {
6855
  line-height: 2;
6856
}
src/sunstone/public/js/plugins/templates-tab.js
2636 2636
                        '</tbody>'+
2637 2637
                    '</table>'+
2638 2638
                    '<br>'+
2639
                    '<div class="vm_param kvm_opt xen_opt vmware_opt" id="selected_hosts_template">'+
2639
                    '<div class="kvm_opt xen_opt vmware_opt" id="selected_hosts_template">'+
2640 2640
                      '<span id="select_hosts" class="radius secondary label">'+tr("Please select one or more hosts from the list")+'</span> '+
2641 2641
                      '<span id="hosts_selected" class="radius secondary label hidden">You selected the following hosts:</span> '+
2642 2642
                    '</div>'+
......
2663 2663
                        '</tbody>'+
2664 2664
                    '</table>'+
2665 2665
                    '<br>'+
2666
                    '<div class="vm_param kvm_opt xen_opt vmware_opt" id="selected_clusters_template">'+
2666
                    '<div class="kvm_opt xen_opt vmware_opt" id="selected_clusters_template">'+
2667 2667
                      '<span id="select_clusters" class="radius secondary label">'+tr("Please select one or more clusters from the list")+'</span> '+
2668 2668
                      '<span id="clusters_selected" class="radius secondary label hidden">You selected the following clusters:</span> '+
2669 2669
                    '</div>'+
src/sunstone/public/js/plugins/vms-tab.js
1386 1386
    Sunstone.updateInfoPanelTab("vm_info_panel","vm_hotplugging_tab",hotplugging_tab);
1387 1387
    Sunstone.updateInfoPanelTab("vm_info_panel","vm_network_tab",network_tab);
1388 1388
    Sunstone.updateInfoPanelTab("vm_info_panel","vm_snapshot_tab",snapshot_tab);
1389
<<<<<<< HEAD
1389 1390
    Sunstone.updateInfoPanelTab("vm_info_panel","vm_placement_tab",placement_tab);
1390 1391
    Sunstone.updateInfoPanelTab("vm_info_panel","vm_template_tab",template_tab);
1391 1392
    Sunstone.updateInfoPanelTab("vm_info_panel","vm_log_tab",log_tab);
1392 1393
    Sunstone.updateInfoPanelTab("vm_info_panel","vm_actions_tab",actions_tab);
1394
=======
1395
    Sunstone.updateInfoPanelTab("vm_info_panel","vm_history_tab",history_tab);
1396
    Sunstone.updateInfoPanelTab("vm_info_panel","vm_actions_tab",actions_tab);
1397
    Sunstone.updateInfoPanelTab("vm_info_panel","vm_template_tab",template_tab);
1398
    Sunstone.updateInfoPanelTab("vm_info_panel","vm_log_tab",log_tab);
1399
    Sunstone.updateInfoPanelTab("vm_info_panel","vm_history_tab",history_tab);
1400
>>>>>>> feature #1664: Fix datepicker in Actions tab
1393 1401

  
1394 1402
    // TODO: re-use pool_monitor data?
1395 1403

  
......
1416 1424
function printActionsTable(vm_info)
1417 1425
{
1418 1426

  
1419
    var str = '<button id="add_scheduling_action" class="button small secondary radius" >' + tr("Schedule action") +'</button>\
1427
    var str = '<div class="twelve columns">\
1428
                  <button id="add_scheduling_action" class="button small secondary radius" >' + tr("Schedule action") +'</button>\
1429
                </div><br><br>\
1420 1430
                <div class="twelve columns">\
1421 1431
                <table id="scheduling_actions_table" class="info_table twelve datatable extended_table">\
1422 1432
                 <thead>\
......
1447 1457

  
1448 1458
        $("#add_scheduling_action").attr("disabled", "disabled");
1449 1459

  
1460
        //$("#scheduling_actions_table").append('<tr><td></td>\
1461
        //     <td class="action_row"><select id="select_new_action" class="select_new_action" name="select_action">\
1462
        //                        <option value="shutdown">' + tr("shutdown") + '</option>\
1463
        //                        <option value="hold">' + tr("hold") + '</option>\
1464
        //                        <option value="release">' + tr("release") + '</option>\
1465
        //                        <option value="stop">' + tr("stop") + '</option>\
1466
        //                        <option value="cancel">' + tr("cancel") + '</option>\
1467
        //                        <option value="suspend">' + tr("suspend") + '</option>\
1468
        //                        <option value="resume">' + tr("resume") + '</option>\
1469
        //                        <option value="restart">' + tr("restart") + '</option>\
1470
        //                        <option value="resubmit">' + tr("resubmit") + '</option>\
1471
        //                        <option value="reboot">' + tr("reboot") + '</option>\
1472
        //                        <option value="reset">' + tr("reset") + '</option>\
1473
        //                        <option value="poweroff">' + tr("poweroff") + '</option>\
1474
        //                        <option value="snapshot-create">' + tr("snapshot-create") + '</option>\
1475
        //                      </select>\
1476
        //      </td>\
1477
        //     <td class="time_row"><input id="date_time_input"><a class="date_time_picker_add_link">t</a></td>\
1478
        //     <td>\
1479
        //        <button id="submit_scheduling_action" class="button small secondary radius" >' + tr("Add") +'</button>\
1480
        //     </td>\
1481
        //   </tr>');
1482

  
1450 1483
        $("#scheduling_actions_table").append('<tr><td></td>\
1451
             <td class="action_row"><select id="select_new_action" class="select_new_action" name="select_action">\
1484
             <td class="columns"><select id="select_new_action" class="select_new_action" name="select_action">\
1452 1485
                                <option value="shutdown">' + tr("shutdown") + '</option>\
1453 1486
                                <option value="hold">' + tr("hold") + '</option>\
1454 1487
                                <option value="release">' + tr("release") + '</option>\
......
1464 1497
                                <option value="snapshot-create">' + tr("snapshot-create") + '</option>\
1465 1498
                              </select>\
1466 1499
              </td>\
1467
             <td class="time_row"><input id="date_time_input"><a class="date_time_picker_add_link">t</a></td>\
1500
             <td>\
1501
                <input id="date_input" class="jdpicker" type="text" placeholder="2013/12/30"/>\
1502
                <input id="time_input" class="timepicker" type="text" placeholder="12:30"/>\
1503
             </td>\
1468 1504
             <td>\
1469 1505
                <button id="submit_scheduling_action" class="button small secondary radius" >' + tr("Add") +'</button>\
1470 1506
             </td>\
1507
             <td colspan=2></td>\
1471 1508
           </tr>');
1472 1509

  
1473
        $(".date_time_picker_add_link").die();
1474
        $(".date_time_picker_add_link").live("click", function() {
1475
            setupDateTimePicker('#date_time_input', "");
1476
        });
1510
        $("#date_input").jdPicker();
1511
        $("#time_input").timePicker();
1477 1512

  
1478 1513
        return false;
1479 1514
    });
1480 1515

  
1481 1516
    $("#submit_scheduling_action").live("click", function() {
1482
        var date_input_value = $("#date_time_input").val();
1517
        var date_input_value = $("#date_input").val();
1518
        var time_input_value = $("#time_input").val();
1483 1519

  
1484
        if (date_input_value=="")
1520
        if (date_input_value=="" || time_input_value=="")
1485 1521
          return false;
1486 1522

  
1523
        var time_value = date_input_value + ' ' + time_input_value
1524

  
1525

  
1487 1526
        // Calculate MAX_ID
1488 1527
        var max_id = -1;
1489 1528

  
......
1510 1549
        var new_action = {};
1511 1550
        new_action.ID  = parseInt(max_id) + 1;
1512 1551
        new_action.ACTION = $("#select_new_action").val();
1513
        var epoch_str   = new Date(date_input_value);
1552
        var epoch_str   = new Date(time_value);
1553
        console.log(epoch_str)
1514 1554
        new_action.TIME = parseInt(epoch_str.getTime())/1000;
1515 1555

  
1516 1556
        vm_info.USER_TEMPLATE.SCHED_ACTION.push(new_action);
......
1540 1580
        Sunstone.runAction("VM.update_actions",vm_info.ID,template_str);
1541 1581
    });
1542 1582

  
1543
    // Listener for key,value pair edit action
1544
    $(".edit_action_e").live("click", function() {
1545
        // Action
1546
        $("#add_scheduling_action").attr("disabled", "disabled");
1547

  
1548
        var index=this.id.substring(5,this.id.length);
1549

  
1550
        var value_str = $(".tr_action_"+index+" .action_row").text();
1551
        $(".tr_action_"+index+" .action_row").html('<select id="select_action_'+index+'" class="select_action" name="select_action">\
1552
                                <option value="shutdown">' + tr("shutdown") + '</option>\
1553
                                <option value="hold">' + tr("hold") + '</option>\
1554
                                <option value="release">' + tr("release") + '</option>\
1555
                                <option value="stop">' + tr("stop") + '</option>\
1556
                                <option value="cancel">' + tr("cancel") + '</option>\
1557
                                <option value="suspend">' + tr("suspend") + '</option>\
1558
                                <option value="resume">' + tr("resume") + '</option>\
1559
                                <option value="restart">' + tr("restart") + '</option>\
1560
                                <option value="resubmit">' + tr("resubmit") + '</option>\
1561
                                <option value="reboot">' + tr("reboot") + '</option>\
1562
                                <option value="reset">' + tr("reset") + '</option>\
1563
                                <option value="poweroff">' + tr("poweroff") + '</option>\
1564
                                <option value="snapshot-create">' + tr("snapshot-create") + '</option>\
1565
                              </select>')
1566
        $(".select_action").val(value_str);
1567

  
1568
        // Time
1569
        var time_value_str = $(".tr_action_"+index+" .time_row").text();
1570
        $(".tr_action_"+index+" .time_row").html('<div><input style="width:90%;" class="input_edit_time" id="input_edit_time_'+
1571
                        index+'" type="text" value="'+time_value_str+'">\
1572
                        <a class="date_time_picker_link">t</a></div>');
1573

  
1574
        $(".date_time_picker_link").die();
1575
        $(".date_time_picker_link").live("click", function() {
1576
            setupDateTimePicker('#input_edit_time_'+index, time_value_str);
1577
        });
1578
    });
1579

  
1580
     $(".select_action").live("change", function() {
1581
        var index     = $.trim(this.id.substring(14,this.id.length));
1582
        var tmp_tmpl  = new Array();
1583
        var value_str = $(this).val();
1584

  
1585
        if(vm_info.USER_TEMPLATE.SCHED_ACTION.length)
1586
        {
1587
          $.each(vm_info.USER_TEMPLATE.SCHED_ACTION, function(i,element){
1588
              tmp_tmpl[i] = element;
1589
              if(element.ID==index)
1590
                tmp_tmpl[i].ACTION = value_str;
1591
          })
1592
          vm_info.USER_TEMPLATE.SCHED_ACTION = tmp_tmpl;
1593
        }
1594
        else
1595
        {
1596
            vm_info.USER_TEMPLATE.SCHED_ACTION.ACTION = value_str;
1597
        }
1598

  
1599
        var template_str = convert_template_to_string(vm_info.USER_TEMPLATE);
1600

  
1601
        // Let OpenNebula know
1602
        Sunstone.runAction("VM.update_actions",vm_info.ID,template_str);
1603
        $("#add_scheduling_action").removeAttr("disabled");
1604
    });
1605

  
1606
    $(".input_edit_time").live("change", function() {
1607
        var index     = $.trim(this.id.substring(16,this.id.length));
1608
        var tmp_tmpl  = new Array();
1609
        var epoch_str  = new Date($(this).val());
1610

  
1611
        if(vm_info.USER_TEMPLATE.SCHED_ACTION.length)
1612
        {
1613
          $.each(vm_info.USER_TEMPLATE.SCHED_ACTION, function(i,element){
1614
              if(element.ID==index)
1615
              {
1616
                element.TIME = parseInt(epoch_str.getTime())/1000;
1617
              }
1618
              tmp_tmpl.push(element);
1619
          })
1620
          vm_info.USER_TEMPLATE.SCHED_ACTION = tmp_tmpl;
1621
        }
1622
        else
1623
        {
1624
            vm_info.USER_TEMPLATE.SCHED_ACTION.TIME = parseInt(epoch_str.getTime())/1000;
1625
        }
1626

  
1627
        var template_str = convert_template_to_string(vm_info.USER_TEMPLATE);
1628

  
1629
        // Let OpenNebula know
1630
        Sunstone.runAction("VM.update_actions",vm_info.ID,template_str);
1631
        $("#add_scheduling_action").removeAttr("disabled");
1632
    });
1583
    //// Listener for key,value pair edit action
1584
    //$(".edit_e").live("click", function() {
1585
    //    // Action
1586
    //    $("#add_scheduling_action").attr("disabled", "disabled");
1587
//
1588
    //    var index=this.id.substring(5,this.id.length);
1589
//
1590
    //    var value_str = $(".tr_action_"+index+" .action_row").text();
1591
    //    $(".tr_action_"+index+" .action_row").html('<select id="select_action_'+index+'" class="select_action" name="select_action">\
1592
    //                            <option value="shutdown">' + tr("shutdown") + '</option>\
1593
    //                            <option value="hold">' + tr("hold") + '</option>\
1594
    //                            <option value="release">' + tr("release") + '</option>\
1595
    //                            <option value="stop">' + tr("stop") + '</option>\
1596
    //                            <option value="cancel">' + tr("cancel") + '</option>\
1597
    //                            <option value="suspend">' + tr("suspend") + '</option>\
1598
    //                            <option value="resume">' + tr("resume") + '</option>\
1599
    //                            <option value="restart">' + tr("restart") + '</option>\
1600
    //                            <option value="resubmit">' + tr("resubmit") + '</option>\
1601
    //                            <option value="reboot">' + tr("reboot") + '</option>\
1602
    //                            <option value="reset">' + tr("reset") + '</option>\
1603
    //                            <option value="poweroff">' + tr("poweroff") + '</option>\
1604
    //                            <option value="snapshot-create">' + tr("snapshot-create") + '</option>\
1605
    //                          </select>')
1606
    //    $(".select_action").val(value_str);
1607
//
1608
    //    // Time
1609
    //    var time_value_str = $(".tr_action_"+index+" .time_row").text();
1610
    //    $(".tr_action_"+index+" .time_row").html('<div><input style="width:90%;" class="input_edit_time" id="input_edit_time_'+
1611
    //                    index+'" type="text" value="'+time_value_str+'">\
1612
    //                    <a class="date_time_picker_link">t</a></div>');
1613
//
1614
    //    $(".date_time_picker_link").die();
1615
    //    $(".date_time_picker_link").live("click", function() {
1616
    //        setupDateTimePicker('#input_edit_time_'+index, time_value_str);
1617
    //    });
1618
    //});
1619
//
1620
    // $(".select_action").live("change", function() {
1621
    //    var index     = $.trim(this.id.substring(14,this.id.length));
1622
    //    var tmp_tmpl  = new Array();
1623
    //    var value_str = $(this).val();
1624
//
1625
    //    if(vm_info.USER_TEMPLATE.SCHED_ACTION.length)
1626
    //    {
1627
    //      $.each(vm_info.USER_TEMPLATE.SCHED_ACTION, function(i,element){
1628
    //          tmp_tmpl[i] = element;
1629
    //          if(element.ID==index)
1630
    //            tmp_tmpl[i].ACTION = value_str;
1631
    //      })
1632
    //      vm_info.USER_TEMPLATE.SCHED_ACTION = tmp_tmpl;
1633
    //    }
1634
    //    else
1635
    //    {
1636
    //        vm_info.USER_TEMPLATE.SCHED_ACTION.ACTION = value_str;
1637
    //    }
1638
//
1639
    //    var template_str = convert_template_to_string(vm_info.USER_TEMPLATE);
1640
//
1641
    //    // Let OpenNebula know
1642
    //    Sunstone.runAction("VM.update_template",vm_info.ID,template_str);
1643
    //    $("#add_scheduling_action").removeAttr("disabled");
1644
    //});
1645
//
1646
    //$(".input_edit_time").live("change", function() {
1647
    //    var index     = $.trim(this.id.substring(16,this.id.length));
1648
    //    var tmp_tmpl  = new Array();
1649
    //    var epoch_str  = new Date($(this).val());
1650
//
1651
    //    if(vm_info.USER_TEMPLATE.SCHED_ACTION.length)
1652
    //    {
1653
    //      $.each(vm_info.USER_TEMPLATE.SCHED_ACTION, function(i,element){
1654
    //          if(element.ID==index)
1655
    //          {
1656
    //            element.TIME = parseInt(epoch_str.getTime())/1000;
1657
    //          }
1658
    //          tmp_tmpl.push(element);
1659
    //      })
1660
    //      vm_info.USER_TEMPLATE.SCHED_ACTION = tmp_tmpl;
1661
    //    }
1662
    //    else
1663
    //    {
1664
    //        vm_info.USER_TEMPLATE.SCHED_ACTION.TIME = parseInt(epoch_str.getTime())/1000;
1665
    //    }
1666
//
1667
    //    var template_str = convert_template_to_string(vm_info.USER_TEMPLATE);
1668
//
1669
    //    // Let OpenNebula know
1670
    //    Sunstone.runAction("VM.update_template",vm_info.ID,template_str);
1671
    //    $("#add_scheduling_action").removeAttr("disabled");
1672
    //});
1633 1673

  
1634 1674
    return str;
1635 1675
}
......
1669 1709
             <td class="message_row">'+message_str+'</td>\
1670 1710
             <td>\
1671 1711
               <div>\
1712
<<<<<<< HEAD
1672 1713
                 <a id="edit_'+scheduling_action.ID+'" class="edit_action_e" href="#"><i class="icon-edit"/></a>\
1673 1714
                 &nbsp;&nbsp;\
1674 1715
                 <a id="minus_'+scheduling_action.ID+'" class="remove_action_x" href="#"><i class="icon-trash"/></a>\
1716
=======
1717
                 <a id="minus_'+scheduling_action.ID+'" class="remove_x" href="#"><i class="icon-trash"/></a>\
1718
>>>>>>> feature #1664: Fix datepicker in Actions tab
1675 1719
               </div>\
1676 1720
             </td>\
1677 1721
           </tr>';
src/sunstone/public/js/sunstone-util.js
711 711
//        colors: [ "#cdebf5", "#2ba6cb", "#6f6f6f" ]
712 712
        colors: [ "#2ba6cb", "#707D85", "#AC5A62" ],
713 713
        legend : { show : (info.div_legend != undefined),
714
                   noColumns: attributes.length+1,
714
                   noColumns: attributes.length,
715 715
                   container: info.div_legend
716 716
                 },
717 717
        xaxis : {
......
826 826
        //colors: [ "#2ba6cb", "#cdebf5", "#6f6f6f" ],
827 827
        colors: [ "#2ba6cb", "#707D85", "#AC5A62" ],
828 828
        legend : { show : (info.div_legend != undefined),
829
                   noColumns: attributes.length+1,
829
                   noColumns: attributes.length,
830 830
                   backgroundColor: "black",
831 831
                   container: info.div_legend
832 832
                 },
src/sunstone/public/sass/app.scss
733 733
    overflow-y: auto;
734 734
    overflow-x: hidden;
735 735
    padding: 5px;
736
}
737

  
738

  
739

  
740
// time-picker
741
div.time-picker {
742
  position: absolute;
743
  height: 191px;
744
  width:4em; /* needed for IE */
745
  overflow: auto;
746
  background: #fff;
747
  border: 1px solid #aaa;
748
  z-index: 99;
749
  margin: 0;
750
}
751
div.time-picker-12hours {
752
  width:6em; /* needed for IE */
753
}
754

  
755
div.time-picker ul {
756
  list-style-type: none;
757
  margin: 0;
758
  padding: 0;
759
}
760
div.time-picker li {
761
  cursor: pointer;
762
  height: 20px;
763
  font: 12px/1 Helvetica, Arial, sans-serif;
764
  padding: 4px 3px;
765
}
766
div.time-picker li.selected {
767
  background: #0063CE;
768
  color: #fff;
769
}
770

  
771

  
772
.timepicker{
773
    float:left;
774
    width:50px !important;
775
}
776

  
777
.jdpicker {
778
    float:left;
779
    width:90px !important;
780
}
781

  
782
.columns {
783
    line-height: 2;
736 784
}
src/sunstone/views/index.erb
34 34
    <link rel="stylesheet" type="text/css" href="vendor/4.0/nouislider/nouislider.css"/>
35 35
    <script type="text/javascript" src="vendor/4.0/nouislider/jquery.nouislider.min.js"></script>
36 36

  
37
    <link rel="stylesheet" type="text/css" href="vendor/4.0/jdpicker_1.1/jdpicker.css"/>
38
    <script type="text/javascript" src="vendor/4.0/jdpicker_1.1/jquery.jdpicker.js"></script>
39

  
40
    <script type="text/javascript" src="vendor/4.0/jquery.timePicker.min.js"></script>
41

  
37 42
    <script type="text/javascript" src="vendor/4.0/datetimepicker/jquery.simple-dtpicker.js"></script>
38 43
    <link type="text/css" href="vendor/4.0/datetimepicker/jquery.simple-dtpicker.css" rel="stylesheet" />
39 44

  

Also available in: Unified diff