Projet

Général

Profil

0001-misc-adapt-sidebar-to-native-gadjo-sidebar-22440.patch

Frédéric Péters, 15 avril 2018 09:08

Télécharger (4,44 ko)

Voir les différences: 

Subject: [PATCH] misc: adapt sidebar to native gadjo sidebar (#22440)


 combo/manager/static/css/combo.manager.css          | 13 ++-----------
 combo/manager/templates/combo/page_view.html        | 12 +++++++-----
 data/themes/gadjo/static/css/agent-portal.css       | 11 -----------
 .../templates/combo/page_template_sidebar.html      |  8 +++-----
 tests/test_manager.py                               |  4 ++--
 5 files changed, 14 insertions(+), 34 deletions(-)
combo/manager/static/css/combo.manager.css
2 2 
	margin-bottom: 1em;
3 3 
}
4 4 

  		




  5
  
  
    
div#sidebar {

  		




  6
  
  
    
	width: 20em;

  		




  7
  
  
    
	float: left;

  		




  8
  
  
    
}

  		




  9
  
  
    

  		




  10
  
  
    
div#page-content {

  		




  11
  
  
    
	padding-left: 22em;

  		




  12
  
  
    
	min-height: 5em;

  		




  13
  
  
    
}

  		




  14
  
  
    

  		




  15
  5
  
    
div.page-options label {

  		




  16
  6
  
    
	display: block;

  		




  
  7
  
    
	font-weight: bold;

  		




  17
  8
  
    
}

  		




  18
  9
  
    

  		




  19
  10
  
    
div.placeholder {

  		




  ......




  372
  363
  
    
}

  		




  373
  364
  
    

  		




  374
  365
  
    
img.page-picture {

  		




  375
  
  
    
	max-width: 95%;

  		




  
  366
  
    
	max-width: 100%;

  		




  376
  367
  
    
}

  		












  

    
      combo/manager/templates/combo/page_view.html
    
  





  15
  15
  
    
  <a href="{% url 'combo-manager-page-view' pk=object.id %}">{% trans 'Page' %} - {{object.title }}</a>

  		




  16
  16
  
    
{% endblock %}

  		




  17
  17
  
    

  		




  18
  
  
    
{% block content %}

  		




  19
  
  
    

  		




  20
  
  
    
<div id="sidebar">

  		




  
  18
  
    
{% block sidebar %}

  		




  
  19
  
    
<aside id="sidebar">

  		




  21
  20
  
    

  		




  22
  21
  
    
<div class="page-options">

  		




  23
  
  
    
<h2>{% trans 'Parameters' %}</h2>

  		




  
  22
  
    
<h3>{% trans 'Parameters' %}</h3>

  		




  24
  23
  
    

  		




  25
  24
  
    
<p>

  		




  26
  25
  
    
<label>{% trans 'Title:' %}</label>

  		




  ......




  71
  70
  
    

  		




  72
  71
  
    
</div>

  		




  73
  72
  
    

  		




  74
  
  
    
</div> <!-- #sidebar -->

  		




  
  73
  
    
</aside>

  		




  
  74
  
    
{% endblock %} {# sidebar #}

  		




  
  75
  
    

  		




  
  76
  
    
{% block content %}

  		




  75
  77
  
    

  		




  76
  78
  
    
<div id="page-content">

  		




  77
  79
  
    

  		












  

    
      data/themes/gadjo/static/css/agent-portal.css
    
  





  1
  
  
    
body.with-sidebar div#main-content {

  		




  2
  
  
    
	width: 70%;

  		




  3
  
  
    
}

  		




  4
  
  
    

  		




  5
  
  
    
body.with-sidebar div#sidebar {

  		




  6
  
  
    
	float: right;

  		




  7
  
  
    
	width: 23%;

  		




  8
  
  
    
	margin-right: 2%;

  		




  9
  
  
    
	color: #666;

  		




  10
  
  
    
}

  		




  11
  
  
    

  		




  12
  1
  
    
div.welcome {

  		




  13
  2
  
    
	border: 1px solid #e4e4e4;

  		




  14
  3
  
    
	background: #fcfcfc;

  		












  

    
      data/themes/gadjo/templates/combo/page_template_sidebar.html
    
  





  1
  1
  
    
{% extends "combo/page_template.html" %}

  		




  2
  2
  
    
{% load combo i18n %}

  		




  3
  3
  
    

  		




  4
  
  
    
{% block bodyargs %}{{ block.super }} class="with-sidebar"{% endblock %}

  		




  5
  
  
    

  		




  6
  4
  
    
{% block combo-content %}

  		




  7
  5
  
    
<div id="page-content">

  		




  8
  6
  
    
{% trans "Content" as name %}

  		




  ......




  10
  8
  
    
</div>

  		




  11
  9
  
    
{% endblock %}

  		




  12
  10
  
    

  		




  13
  
  
    
{% block after-main-content %}

  		




  14
  
  
    
<div id="sidebar">

  		




  
  11
  
    
{% block sidebar %}

  		




  
  12
  
    
<aside id="sidebar">

  		




  15
  13
  
    
{% trans "Sidebar" as name %}

  		




  16
  14
  
    
{% placeholder "sidebar" name=name %}

  		




  17
  
  
    
</div>

  		




  
  15
  
    
</aside>

  		




  18
  16
  
    
{% endblock %}

  		












  

    
      tests/test_manager.py
    
  





  690
  690
  
    
    resp = app.get('/manage/pages/%s/' % page.id)

  		




  691
  691
  
    
    assert re.findall('data-placeholder-key="(.*)">', resp.body) == ['content', 'foobar', 'footer']

  		




  692
  692
  
    
    assert re.findall('<h2>(.*)</h2>', resp.body) == [

  		




  693
  
  
    
            'Page - One', 'Parameters', 'Content', 'JSON Feed / Foobar', 'Footer']

  		




  
  693
  
    
            'Page - One', 'Content', 'JSON Feed / Foobar', 'Footer']

  		




  694
  694
  
    

  		




  695
  695
  
    
def test_page_familycell_placeholder(app, admin_user):

  		




  696
  696
  
    
    page = Page(title='My family', slug='my-family', template_name='standard')

  		




  ......




  702
  702
  
    
    resp = app.get('/manage/pages/%s/' % page.id)

  		




  703
  703
  
    
    assert re.findall('data-placeholder-key="(.*)">', resp.body) == ['content', "family_unlinked_user", "footer"]

  		




  704
  704
  
    
    assert re.findall('<h2>(.*)</h2>', resp.body) == [

  		




  705
  
  
    
        'Page - My family', 'Parameters', 'Content',

  		




  
  705
  
    
        'Page - My family', 'Content',

  		




  706
  706
  
    
        'Family Information Cell / Top content for unlinked users', 'Footer']

  		




  707
  707
  
    

  		




  708
  708
  
    
def test_page_discover_placeholder_with_error_cells(app, admin_user):

  		




  709
  
  
    
-