templates/default.tmpl - Issue 29335113: Issue 2675 - Implemented responsive header for web.eyeo.com

Side by Side Diff: templates/default.tmpl

Issue 29335113: Issue 2675 - Implemented responsive header for web.eyeo.com (Closed)

Patch Set: Minor code style and variable scope cleanup Created Feb. 29, 2016, 5:03 p.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View unified diff | Download patch

OLD	NEW
1 <!DOCTYPE html>	1 <!DOCTYPE html>

2 <html lang="{{locale}}">	2 <html lang="{{locale}}">

3 <head>	3 <head>

4 <meta charset="UTF-8" />	4 <meta charset="UTF-8" />

5 <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scal e=1,user-scalable=no" />	5 <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scal e=1,user-scalable=no" />

6 <meta http-equiv="X-UA-Compatible" content="IE=edge">	6 <meta http-equiv="X-UA-Compatible" content="IE=edge">

7	7

8 {% if title %}	8 {% if title %}

9 <title>{{title}} \| Eyeo GmbH</title>	9 <title>{{title}} \| Eyeo GmbH</title>

10 {% else %}	10 {% else %}

11 <title>Eyeo GmbH</title>	11 <title>Eyeo GmbH</title>

12 {% endif %}	12 {% endif %}

13	13

14 <link rel="shortcut icon" href="/images/favicon.png" />	14 <link rel="shortcut icon" href="/images/favicon.png" />

15	15

16 <link rel="stylesheet" href="/css/styles.css" type="text/css" media="all">	16 <link rel="stylesheet" href="/css/styles.css" type="text/css" media="all">

17	17

	18 <!--[if lt IE 9]>

	19 <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></scri pt>

	20 <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
	saroyanm 2016/04/08 16:56:10 I think you would like to get both files from our I think you would like to get both files from our server. juliandoucette 2016/04/25 19:08:56 Good catch. Show quoted text On 2016/04/08 16:56:10, saroyanm wrote: > I think you would like to get both files from our server. Good catch.
	21 <![endif]-->

	22

18 <script src="/js/jquery.js"></script>	23 <script src="/js/jquery.js"></script>

19 <script src="/js/scripts.js"></script>	24 <script src="/js/scripts.js"></script>

20	25

21 <link rel="canonical" href="https://eyeo.com/{{ page[:-5] if page.split('/')[- 1] == 'index' else page }}">	26 <link rel="canonical" href="https://eyeo.com/{{ page[:-5] if page.split('/')[- 1] == 'index' else page }}">

22	27

23 {% block head %}	28 {% block head %}

24 {{head\|safe}}	29 {{head\|safe}}

25 {% endblock %}	30 {% endblock %}

26 </head>	31 </head>

27	32

28 <body id="top" class="home page page-template-default apollo_validation_on cover wpb-js-composer js-comp-ver-3.6.14.1 vc_responsive">	33 <body id="top" class="home page page-template-default apollo_validation_on cover wpb-js-composer js-comp-ver-3.6.14.1 vc_responsive">

29	34

30 <header id="header">	35 <header id="header" class="top">

31 <div class="content-block">	36 <div class="content-block">

32 <a id="logo" href="{{source.resolve_link("index", locale)[1]}}" hreflang=" {{source.resolve_link("index", locale)[0]}}" title="Eyeo GmbH" rel="home"><img s rc="/images/tog_logo.png" alt="Eyeo GmbH" /></a>

33	37

34 <nav id="menu" role="navigation">	38 <a
	saroyanm 2016/04/08 16:56:10 While we do have 80 line limit for coding style we While we do have 80 line limit for coding style we didn't used that rule for HTML pages yet, so I'll suggest not to apply that rule for html yet, also it will make this review easier. juliandoucette 2016/04/25 19:08:56 Sorry, I thought it was easier to read this way. Show quoted text On 2016/04/08 16:56:10, saroyanm wrote: > While we do have 80 line limit for coding style we didn't used that rule for > HTML pages yet, so I'll suggest not to apply that rule for html yet, also it > will make this review easier. Sorry, I thought it was easier to read this way. saroyanm 2016/05/06 14:49:28 Currently how it's done it's inconsistent, you hav Show quoted text On 2016/04/25 19:08:56, juliandoucette wrote: > On 2016/04/08 16:56:10, saroyanm wrote: > > While we do have 80 line limit for coding style we didn't used that rule for > > HTML pages yet, so I'll suggest not to apply that rule for html yet, also it > > will make this review easier. > > Sorry, I thought it was easier to read this way. Currently how it's done it's inconsistent, you have elements that doesn't exceed 80 and you move their attributes to new line, while there are elements which attributes are not moved to new line, I think we need to come up with some general rules for that, I'll suggest leave it as it was before for this review and come up with some general rules to improve coding standard for HTML. juliandoucette 2016/05/11 18:11:06 Agreed. Will do. Show quoted text On 2016/05/06 14:49:28, saroyanm wrote: > On 2016/04/25 19:08:56, juliandoucette wrote: > > On 2016/04/08 16:56:10, saroyanm wrote: > > > While we do have 80 line limit for coding style we didn't used that rule for > > > HTML pages yet, so I'll suggest not to apply that rule for html yet, also it > > > will make this review easier. > > > > Sorry, I thought it was easier to read this way. > > Currently how it's done it's inconsistent, you have elements that doesn't exceed > 80 and you move their attributes to new line, while there are elements which > attributes are not moved to new line, I think we need to come up with some > general rules for that, I'll suggest leave it as it was before for this review > and come up with some general rules to improve coding standard for HTML. Agreed. Will do.
	39 id="logo"

	40 href="{{source.resolve_link("index", locale)[1]}}"

	41 hreflang="{{source.resolve_link("index", locale)[0]}}"

	42 title="Eyeo GmbH" rel="home">

	43 <img src="/images/tog_logo.png" height="51px" alt="Eyeo GmbH" />

	44 </a>

	45

	46 <a
	saroyanm 2016/05/06 14:49:28 I can't understand why we have this element and th I can't understand why we have this element and the one below. Does they provide any value ? juliandoucette 2016/05/11 18:11:06 Providing a "skip to content" link is a standard a Show quoted text On 2016/05/06 14:49:28, saroyanm wrote: > I can't understand why we have this element and the one below. Does they provide > any value ? Providing a "skip to content" link is a standard accessibility practice. However, our template does not have a #beginning-of-content or #secondary content area. I will remove these. juliandoucette 2016/05/11 18:41:27 Scratch that. I actually just removed one and fixe Show quoted text On 2016/05/11 18:11:06, juliandoucette wrote: > On 2016/05/06 14:49:28, saroyanm wrote: > > I can't understand why we have this element and the one below. Does they > provide > > any value ? > > Providing a "skip to content" link is a standard accessibility practice. > > However, our template does not have a #beginning-of-content or #secondary > content area. > > I will remove these. Scratch that. I actually just removed one and fixed the other to link to #content. Let me know if you approve :) .
	47 class="assistive-text"

	48 href="#begin-of-content">

	49 Skip to primary content

	50 </a>

	51 <a

	52 class="assistive-text"

	53 href="#secondary">

	54 Skip to secondary content

	55 </a>

	56

	57 <button type="button" id="header-hamberger" aria-expanded="false">

	58 <span class="assistive-text">Toggle navigation</span>

	59 <span class="icon-bar"></span>

	60 <span class="icon-bar"></span>

	61 <span class="icon-bar"></span>

	62 </button>

	63

	64 <a

	65 href="{{source.resolve_link("jobs", locale)[1]}}"

	66 hreflang="{{source.resolve_link("jobs", locale)[0]}}"

	67 class="menu-button">

	68 Join us - we are hiring!

	69 </a>

	70

	71 <nav

	72 id="menu"

	73 role="navigation"

	74 aria-labelledby="header-hamberger"

	75 aria-expanded="false">

35 <h3 class="assistive-text">Main menu</h3>	76 <h3 class="assistive-text">Main menu</h3>

36 <a class="assistive-text" href="#begin-of-content">Skip to primary conte nt</a>

37 <a class="assistive-text" href="#secondary">Skip to secondary content</a >

38

39 <a href="{{source.resolve_link("jobs", locale)[1]}}" hreflang="{{source. resolve_link("jobs", locale)[0]}}" class="menu-button">Join us - we are hiring!< /a>

40

41 <ul class="menu-list">	77 <ul class="menu-list">

42 {%- for link, title in [("index", "About Us"), ("services", "Services" ), ("team", "Team"), ("press", "Press"), ("contact", "Contact Us")] %}	78 {%- for link, title in [("index", "About Us"), ("services", "Services" ), ("team", "Team"), ("press", "Press"), ("contact", "Contact Us")] %}

43 {%- if link == page %}	79 {%- if link == page %}

44 <li class="menu-item menu-item-type-post_type menu-item-object-pag e current-menu-item page_item current_page_item">{{link\|linkify}}<span>{{title}} </span></a></li>	80 <li

	81 class="menu-item menu-item-type-post_type menu-item-object-page current-menu-item page_item current_page_item">

	82 {{link\|linkify}}

	83 <span>{{title}}</span>

	84 </a>

	85 </li>

45 {%- else %}	86 {%- else %}

46 <li class="menu-item menu-item-type-post_type menu-item-object-pag e">{{link\|linkify}}<span>{{title}}</span></a></li>	87 <li

	88 class="menu-item menu-item-type-post_type menu-item-object-page" >

	89 {{link\|linkify}}

	90 <span>{{title}}</span>

	91 </a>

	92 </li>

47 {%- endif %}	93 {%- endif %}

48 {%- endfor %}	94 {%- endfor %}

49 </ul>	95 </ul>

50 </nav>	96 </nav>

	97

51 </div>	98 </div>

52 </header>	99 </header>

53	100

54 <div id="content">	101 <div id="content">

55 {{body\|safe}}	102 {{body\|safe}}

56 </div>	103 </div>

57	104

58 <footer id="footer">	105 <footer id="footer">

59 <div class="content-block">	106 <div class="content-block">

60 <a id="footer-contact" href="{{source.resolve_link("contact", locale)[1]}} " hreflang="{{source.resolve_link("contact", locale)[0]}}">	107 <a id="footer-contact" href="{{source.resolve_link("contact", locale)[1]}} " hreflang="{{source.resolve_link("contact", locale)[0]}}">

61 Made with ♥ in Cologne	108 Made with ♥ in Cologne

62 </a>	109 </a>

63	110

64 <div class="footer-text">	111 <div class="footer-text">

65 Adblock Plus™ and Acceptable Ads™ are registered trademarks of Eyeo GmbH .	112 Adblock Plus™ and Acceptable Ads™ are registered trademarks of Eyeo GmbH .

66 </div>	113 </div>

67	114

68 <a href="#top" id="to-top" style="opacity: 0;"></a>	115 <a href="#top" id="to-top" style="opacity: 0;"></a>

69 </div>	116 </div>

70 </footer>	117 </footer>

71 </body>	118 </body>

72	119

73 </html>	120 </html>

OLD	NEW

« static/js/scripts.js ('K') | « static/js/scripts.js ('k') | no next file » | no next file with comments »