Commit 78df5012 authored by Stefano Alberto Russo's avatar Stefano Alberto Russo
Browse files

Several UI/UX improvements.

parent 4f91f56f

services/webapp/code/rosetta/core_app/computing_managers.py

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ class LocalComputingManager(ComputingManager): 
            task.tid    = task_tid

            task.status = TaskStatuses.running

            task.ip     = task_ip

            task.port   = int(task.container.default_ports.split(',')[0])

            task.port   = int(task.container.ports.split(',')[0])



            # Save

            task.save()

services/webapp/code/rosetta/core_app/management/commands/core_app_populate.py

+9 −3
Original line number Diff line number Diff line
@@ -114,7 +114,9 @@ class Command(BaseCommand): 
                                     type = 'local',

                                     requires_sys_conf  = False,

                                     requires_user_conf = False,

                                     requires_user_keys = False)

                                     requires_user_keys = False,

                                     supports_docker = True,

                                     supports_singularity = False)





            #==============================
@@ -125,7 +127,9 @@ class Command(BaseCommand): 
                                                             type = 'remote',

                                                             requires_sys_conf  = True,

                                                             requires_user_conf = True,

                                                             requires_user_keys = True)

                                                             requires_user_keys = True,

                                                             supports_docker = True,

                                                             supports_singularity = True)

    

            ComputingSysConf.objects.create(computing = demo_remote_auth_computing,

                                            data      = {'host': 'slurmclusterworker-one'})
@@ -143,7 +147,9 @@ class Command(BaseCommand): 
                                                            type = 'slurm',

                                                            requires_sys_conf  = True,

                                                            requires_user_conf = True,

                                                            requires_user_keys = True)

                                                            requires_user_keys = True,

                                                            supports_docker = False,

                                                            supports_singularity = True)

    

            # Create demo slurm sys computing conf

            ComputingSysConf.objects.create(computing = demo_slurm_computing,

services/webapp/code/rosetta/core_app/models.py

+13 −0
Original line number Diff line number Diff line
@@ -88,6 +88,10 @@ class Container(models.Model): 
    supports_pass_auth = models.BooleanField(default=False)





    class Meta:

        ordering = ['name']





    def __str__(self):

        return str('Container of type "{}" with image "{}" and  ports "{}" from registry "{}" of user "{}"'.format(self.type, self.image, self.ports, self.registry, self.user))
@@ -102,6 +106,8 @@ class Container(models.Model): 
        color_map_index = string_int_hash % len(color_map)

        return color_map[color_map_index]







#=========================

#  Computing resources

#=========================
@@ -123,6 +129,10 @@ class Computing(models.Model): 
    supports_singularity  = models.BooleanField(default=False)





    class Meta:

        ordering = ['name']





    def __str__(self):

        if self.user:

            return str('Computing "{}" of user "{}"'.format(self.name, self.user))
@@ -247,6 +257,9 @@ class Task(models.Model): 
    # Computing options

    computing_options = JSONField(blank=True, null=True)



    class Meta:

        ordering = ['-created']



    def save(self, *args, **kwargs):

        

        try:

services/webapp/code/rosetta/core_app/static/css/stylish-portfolio.css

+14 −1
Original line number Diff line number Diff line
@@ -86,7 +86,20 @@ body { 


.btn-connect:hover {

    color: #fff;

    background-color: rgba(0,95,144,1.0);

    /*background-color: rgba(0,135,184,1.0);*/

    background-color: rgba(0,145,194,1.0);

}



.btn-action {

    border-radius: 0;

    color: rgba(0,95,144,0.8);

    border: #c0c0c0 1px solid;

    background-color: rgba(250,248,250,1.0);

}



.btn-action:hover {

    color: rgba(0,95,144,0.9);

    background-color: rgba(255,255,255,1.0);

}



.btn-disabled:hover {

services/webapp/code/rosetta/core_app/static/img/docker-logo.svg

0 → 100644
+1 −0
Original line number Diff line number Diff line 
<?xml version="1.0" ?><svg enable-background="new 0 0 24 24" id="Layer_1" version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g><rect fill="#0175BC" height="2.5" id="XMLID_1489_" width="2.5" x="11" y="3"/><rect fill="#010101" height="0.25" opacity="0.1" width="2.5" x="11" y="5.25"/><rect fill="#FFFFFF" height="0.25" opacity="0.2" width="2.5" x="11" y="3"/><rect fill="#0175BC" height="2.5" id="XMLID_1314_" width="2.5" x="11" y="6"/><rect fill="#010101" height="0.25" opacity="0.1" width="2.5" x="11" y="8.25"/><rect fill="#FFFFFF" height="0.25" opacity="0.2" width="2.5" x="11" y="6"/><rect fill="#0175BC" height="2.5" id="XMLID_1315_" width="2.5" x="11" y="9"/><rect fill="#010101" height="0.25" opacity="0.1" width="2.5" x="11" y="11.25"/><rect fill="#FFFFFF" height="0.25" opacity="0.2" width="2.5" x="11" y="9"/><rect fill="#0175BC" height="2.5" id="XMLID_1307_" width="2.5" x="8" y="6"/><rect fill="#010101" height="0.25" opacity="0.1" width="2.5" x="8" y="8.25"/><rect fill="#FFFFFF" height="0.25" opacity="0.2" width="2.5" x="8" y="6"/><rect fill="#0175BC" height="2.5" id="XMLID_1306_" width="2.5" x="8" y="9"/><rect fill="#010101" height="0.25" opacity="0.1" width="2.5" x="8" y="11.25"/><rect fill="#FFFFFF" height="0.25" opacity="0.2" width="2.5" x="8" y="9"/><rect fill="#0175BC" height="2.5" id="XMLID_1317_" width="2.5" x="5" y="6"/><rect fill="#010101" height="0.25" opacity="0.1" width="2.5" x="5" y="8.25"/><rect fill="#FFFFFF" height="0.25" opacity="0.2" width="2.5" x="5" y="6"/><rect fill="#0175BC" height="2.5" id="XMLID_1316_" width="2.5" x="5" y="9"/><rect fill="#010101" height="0.25" opacity="0.1" width="2.5" x="5" y="11.25"/><rect fill="#FFFFFF" height="0.25" opacity="0.2" width="2.5" x="5" y="9"/><rect fill="#0175BC" height="2.5" id="XMLID_1318_" width="2.5" x="2" y="9"/><rect fill="#010101" height="0.25" opacity="0.1" width="2.5" x="2" y="11.25"/><rect fill="#FFFFFF" height="0.25" opacity="0.2" width="2.5" x="2" y="9"/><rect fill="#0175BC" height="2.5" id="XMLID_1305_" width="2.5" x="14" y="9"/><rect fill="#010101" height="0.25" opacity="0.1" width="2.5" x="14" y="11.25"/><rect fill="#FFFFFF" height="0.25" opacity="0.2" width="2.5" x="14" y="9"/><path d="M23.5947266,11.223134c-0.0693359-0.0449219-1.4980469-0.9472656-2.8486328-0.7324219   c-0.3271484-1.3691406-1.5830078-2.2216797-1.6445313-2.2626953l-0.3476563-0.2314453c0,0-0.2175694,0.2255478-0.2900391,0.3007813   c-0.026474,0.027482-0.0946941,0.1059952-0.1760216,0.2478724c-0.2248478,0.3922462-0.5498848,1.268816-0.3698769,2.8903217   c0.0175781,0.1523438-0.0283203,0.3027344-0.1259766,0.4111328C17.7041016,11.9453125,17.5820313,12,17.4482422,12H0v0.5   C0,20.171875,5.5947266,21,8,21c6.1933594,0,10.4980469-3.7617188,12.3769531-7.0771484   c2.4755859-0.3945313,3.3330078-1.9497175,3.3779297-2.0239363L24,11.4838762L23.5947266,11.223134z" fill="#0175BC"/><path d="M17.4482422,12H0v0.25h17.4482422c0.1337891,0,0.2558594-0.0546875,0.34375-0.1533203   c0.0976563-0.1083984,0.1435547-0.2587891,0.1259766-0.4111328c-0.0057373-0.0515747-0.0048218-0.0927734-0.0095215-0.1428833   c-0.0093384,0.1130981-0.0423584,0.2217407-0.1164551,0.3040161C17.7041016,11.9453125,17.5820313,12,17.4482422,12z" fill="#FFFFFF" opacity="0.2"/><path d="M23.5947266,11.2231445c-0.0693359-0.0449219-1.4980469-0.9472656-2.8486328-0.7324219   c-0.3271484-1.3691406-1.5830078-2.2216797-1.6445313-2.2626953L18.7539063,7.996582c0,0-0.2175713,0.2255449-0.2900391,0.3007813   c-0.0198631,0.0206213-0.0630627,0.0702648-0.1175747,0.1540194c-0.1881866,0.2891331-0.5111847,0.9847698-0.4742222,2.296176   c0.0114746-1.5025024,0.5079956-2.1130981,0.5917969-2.2001953l0.2900391-0.3007813l0.3476563,0.2314453   c0.0615234,0.0410156,1.3173828,0.8935547,1.6445313,2.2626953C22.0966797,10.5258789,24,11.4838867,24,11.4838867   L23.5947266,11.2231445z" fill="#FFFFFF" opacity="0.2"/><path d="M23.7548828,11.6489258c-0.0449219,0.0742188-0.9023438,1.6293945-3.3779297,2.0239258   C18.4980469,16.9882813,14.1933594,20.75,8,20.75c-2.4052734,0-8-0.828125-8-8.5v0.25C0,20.171875,5.5947266,21,8,21   c6.1933594,0,10.4980469-3.7617188,12.3769531-7.0771484c2.4755859-0.3945313,3.3330078-1.949707,3.3779297-2.0239258   L24,11.4838867l-0.1069946-0.0688477L23.7548828,11.6489258z" fill="#010101" opacity="0.1"/><linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="1.7255629" x2="21.2413311" y1="8.2995186" y2="17.3998699"><stop offset="0" style="stop-color:#FFFFFF;stop-opacity:0.2"/><stop offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/></linearGradient><path d="M13.5,6H11v2.5h2.5V6z M13.5,9H11v2.5h2.5V9z M16.5,9H14v2.5h2.5V9z M13.5,3H11v2.5h2.5V3z M10.5,6   H8v2.5h2.5V6z M4.5,9H2v2.5h2.5V9z M23.5947266,11.2231445c-0.0693359-0.0449219-1.4980469-0.9472656-2.8486328-0.7324219   c-0.3271484-1.3691406-1.5830078-2.2216797-1.6445313-2.2626953L18.7539063,7.996582c0,0-0.2175903,0.2255249-0.2900391,0.3007813   c-0.0264893,0.0274658-0.0946655,0.105957-0.1760254,0.2478638c-0.2248535,0.3922119-0.5498657,1.2687988-0.369873,2.8903198   c0.0175781,0.1523438-0.0283203,0.3027344-0.1259766,0.4111328C17.7041016,11.9453125,17.5820313,12,17.4482422,12H0v0.5   C0,20.171875,5.5947266,21,8,21c6.1933594,0,10.4980469-3.7617188,12.3769531-7.0771484   c2.4755859-0.3945313,3.3330078-1.949707,3.3779297-2.0239258L24,11.4838867L23.5947266,11.2231445z M10.5,9H8v2.5h2.5V9z M7.5,6H5   v2.5h2.5V6z M7.5,9H5v2.5h2.5V9z" fill="url(#SVGID_1_)"/></g><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/><g/></svg>
 
 No newline at end of file