Projet

Général

Profil

0001-backoffice-show-an-slashed-eye-next-to-user-hidden-s.patch

Thomas Noël, 28 août 2019 00:03

Télécharger (3,39 ko)

Voir les différences: 

Subject: [PATCH] backoffice: show an slashed eye next to user hidden statuses
 (#34919)


 wcs/backoffice/management.py            | 5 +++--
 wcs/qommon/static/css/dc2/admin.css     | 7 +++++++
 wcs/qommon/static/css/qommon.css        | 6 ++++++
 wcs/templates/wcs/formdata_history.html | 3 ++-
 4 files changed, 18 insertions(+), 3 deletions(-)
wcs/backoffice/management.py
2105 2105 
                status_colour = None
2106 2106 
            status_colour = status_colour or 'ffffff'
2107 2107 
            fg_colour = misc.get_foreground_colour(status_colour)
2108 
            visibility_off = 'visibility-off' if formdata.get_status().get_visibility_restricted_roles() else ''
2108 2109 

  		




  2109
  
  
    
            r += htmltext('<p class="current-status"><span class="item" style="background: #%s; color: %s;"></span>' %

  		




  2110
  
  
    
                    (status_colour, fg_colour))

  		




  
  2110
  
    
            r += htmltext('<p class="current-status"><span class="item %s" style="background: #%s; color: %s;"></span>' %

  		




  
  2111
  
    
                    (visibility_off, status_colour, fg_colour))

  		




  2111
  2112
  
    
            r += htmltext('<span>%s %s</span></p>') % (_('Status:'), formdata.get_status_label())

  		




  2112
  2113
  
    
            if formdata.formdef.workflow.criticality_levels:

  		




  2113
  2114
  
    
                try:

  		












  

    
      wcs/qommon/static/css/dc2/admin.css
    
  





  1449
  1449
  
    
	display: table-cell;

  		




  1450
  1450
  
    
	vertical-align: middle;

  		




  1451
  1451
  
    
	line-height: 130%;

  		




  
  1452
  
    
	text-align: center;

  		




  
  1453
  
    
}

  		




  
  1454
  
    

  		




  
  1455
  
    
p.current-status span.visibility-off::after {

  		




  
  1456
  
    
	content: "\f070";  /* fa-eye-slash */

  		




  
  1457
  
    
	font-family: FontAwesome;

  		




  
  1458
  
    
	font-size: 20px;

  		




  1452
  1459
  
    
}

  		




  1453
  1460
  
    

  		




  1454
  1461
  
    
p.current-level .item,

  		












  

    
      wcs/qommon/static/css/qommon.css
    
  





  578
  578
  
    
	box-shadow: 0 0 0px 5px white;

  		




  579
  579
  
    
}

  		




  580
  580
  
    

  		




  
  581
  
    
ul#evolutions li.visibility-off span.item::after {

  		




  
  582
  
    
	content: "\f070";  /* fa-eye-slash */

  		




  
  583
  
    
	font-family: FontAwesome;

  		




  
  584
  
    
	font-size: 20px;

  		




  
  585
  
    
}

  		




  
  586
  
    

  		




  581
  587
  
    
div.halfwidth {

  		




  582
  588
  
    
	width: 45%;

  		




  583
  589
  
    
	float: left;

  		












  

    
      wcs/templates/wcs/formdata_history.html
    
  





  7
  7
  
    
    {% with status=evolution.get_status display_parts=evolution.display_parts %}

  		




  8
  8
  
    
    <li class="{% if evolution.who == '_submitter' %}msg-in{% elif evolution.who %}msg-out{% else %}msg-system{% endif %}

  		




  9
  9
  
    
               {% if status.is_endpoint %}endpoint{% endif %}

  		




  10
  
  
    
               {{ status.extra_css_class }}">

  		




  
  10
  
    
               {% if status.get_visibility_restricted_roles %}visibility-off{% endif %}

  		




  
  11
  
    
               {{ status.extra_css_class|default:"" }}">

  		




  11
  12
  
    
      <span class="item {% if not evolution.status %}no-status-change{% endif %}" style="background: #{{ status.colour }}; color: {{ status.get_contrast_color}}"></span>

  		




  12
  13
  
    
      <div>

  		




  13
  14
  
    
       {% if evolution.status %}

  		




  14
  
  
    
-