1 |
From fbe15becd89f0dc278457fd8f25b87e43d60079c Mon Sep 17 00:00:00 2001 |
2 |
From: Adam Williamson <awilliam@redhat.com> |
3 |
Date: Tue, 29 Sep 2015 19:55:33 -0700 |
4 |
Subject: [PATCH 1/2] replace tabs with spaces |
5 |
|
6 |
this file is hopelessly mixed, clean that up before making the |
7 |
actual change I want so it's clearer |
8 |
--- |
9 |
templates/layouts/bootstrap.html.ep | 104 ++++++++++++++++++------------------ |
10 |
1 file changed, 52 insertions(+), 52 deletions(-) |
11 |
|
12 |
diff --git a/templates/layouts/bootstrap.html.ep b/templates/layouts/bootstrap.html.ep |
13 |
index 410cd6a..2ba6ba6 100644 |
14 |
--- a/templates/layouts/bootstrap.html.ep |
15 |
+++ b/templates/layouts/bootstrap.html.ep |
16 |
@@ -13,10 +13,10 @@ |
17 |
<meta name="csrf-param" content="csrf_token" /> |
18 |
|
19 |
% if ($title) { |
20 |
- <title><%= $appname . ": " . title %></title> |
21 |
+ <title><%= $appname . ": " . title %></title> |
22 |
% } else |
23 |
% { |
24 |
- <title><%= $appname %></title> |
25 |
+ <title><%= $appname %></title> |
26 |
% } |
27 |
|
28 |
<!-- Bootstrap core CSS --> |
29 |
@@ -26,10 +26,10 @@ |
30 |
%= content_for 'head' |
31 |
|
32 |
%= javascript begin |
33 |
- %= content_for 'head_javascript' |
34 |
- $(document).ready(function() { |
35 |
- %= content_for 'ready_function' |
36 |
- } ); |
37 |
+ %= content_for 'head_javascript' |
38 |
+ $(document).ready(function() { |
39 |
+ %= content_for 'ready_function' |
40 |
+ } ); |
41 |
% end |
42 |
|
43 |
<link rel="icon" href="/favicon.ico"> |
44 |
@@ -38,61 +38,61 @@ |
45 |
<body> |
46 |
<div id="wrapper"> |
47 |
<nav class='container-fluid navbar navbar-default navbar-static-top'> |
48 |
- <div class='navbar-inner'> |
49 |
- <div class='container'> |
50 |
- <div class="navbar-header"> |
51 |
- <a class="navbar-brand" href="#"> |
52 |
- <img alt="Brand" src="/images/header-logo.png" /> |
53 |
- </a> |
54 |
- </div> |
55 |
- <div class='collapse navbar-collapse'> |
56 |
- <ul class='nav navbar-nav' id='global-navigation'> |
57 |
- <li id='item-downloads'><a href="http://en.opensuse.org/openSUSE:Browse#Downloads">Downloads</a></li> |
58 |
- <li id='item-support'><a href="http://en.opensuse.org/openSUSE:Browse#Support">Support</a></li> |
59 |
- <li id='item-community'><a href="http://en.opensuse.org/openSUSE:Browse#Community">Community</a></li> |
60 |
- <li id='item-development'><a href="http://en.opensuse.org/openSUSE:Browse#Development">Development</a></li> |
61 |
- </ul> |
62 |
- </div> |
63 |
- </div> |
64 |
- </div> |
65 |
+ <div class='navbar-inner'> |
66 |
+ <div class='container'> |
67 |
+ <div class="navbar-header"> |
68 |
+ <a class="navbar-brand" href="#"> |
69 |
+ <img alt="Brand" src="/images/header-logo.png" /> |
70 |
+ </a> |
71 |
+ </div> |
72 |
+ <div class='collapse navbar-collapse'> |
73 |
+ <ul class='nav navbar-nav' id='global-navigation'> |
74 |
+ <li id='item-downloads'><a href="http://en.opensuse.org/openSUSE:Browse#Downloads">Downloads</a></li> |
75 |
+ <li id='item-support'><a href="http://en.opensuse.org/openSUSE:Browse#Support">Support</a></li> |
76 |
+ <li id='item-community'><a href="http://en.opensuse.org/openSUSE:Browse#Community">Community</a></li> |
77 |
+ <li id='item-development'><a href="http://en.opensuse.org/openSUSE:Browse#Development">Development</a></li> |
78 |
+ </ul> |
79 |
+ </div> |
80 |
+ </div> |
81 |
+ </div> |
82 |
</nav> |
83 |
|
84 |
<div class='container'> |
85 |
- <div class='row' id='subheader'> |
86 |
- <div class='col-md-7'> |
87 |
- %= breadcrumbs |
88 |
- </div> |
89 |
- <div class='col-md-5 text-right'> |
90 |
- <div id="user-info"> |
91 |
- %# Using a variable to avoid additional whitespaces |
92 |
- % if (current_user) { |
93 |
- %# Using a variable to avoid additional whitespaces |
94 |
- % my $out = 'Logged as '. current_user->name.' ('; |
95 |
- % if (is_operator) { |
96 |
- % $out = $out.link_to('manage API keys' => url_for('api_keys')).' | '; |
97 |
- % } |
98 |
- % if (is_admin) { |
99 |
- % $out = $out.link_to('admin' => url_for('admin')).' | '; |
100 |
- % } |
101 |
- %= b($out.link_to('Logout' => url_for('logout') => 'data-method' => 'delete').')'); |
102 |
- % } else { |
103 |
- %= link_to('Login' => url_for('login')); |
104 |
- % } |
105 |
- </div> |
106 |
- </div> |
107 |
- </div> |
108 |
- %= content |
109 |
+ <div class='row' id='subheader'> |
110 |
+ <div class='col-md-7'> |
111 |
+ %= breadcrumbs |
112 |
+ </div> |
113 |
+ <div class='col-md-5 text-right'> |
114 |
+ <div id="user-info"> |
115 |
+ %# Using a variable to avoid additional whitespaces |
116 |
+ % if (current_user) { |
117 |
+ %# Using a variable to avoid additional whitespaces |
118 |
+ % my $out = 'Logged as '. current_user->name.' ('; |
119 |
+ % if (is_operator) { |
120 |
+ % $out = $out.link_to('manage API keys' => url_for('api_keys')).' | '; |
121 |
+ % } |
122 |
+ % if (is_admin) { |
123 |
+ % $out = $out.link_to('admin' => url_for('admin')).' | '; |
124 |
+ % } |
125 |
+ %= b($out.link_to('Logout' => url_for('logout') => 'data-method' => 'delete').')'); |
126 |
+ % } else { |
127 |
+ %= link_to('Login' => url_for('login')); |
128 |
+ % } |
129 |
+ </div> |
130 |
+ </div> |
131 |
+ </div> |
132 |
+ %= content |
133 |
</div> |
134 |
|
135 |
<footer class='footer'> |
136 |
- <div class='container'> |
137 |
- <div id='footer-content'> |
138 |
+ <div class='container'> |
139 |
+ <div id='footer-content'> |
140 |
%= content_for 'footer' |
141 |
</div> |
142 |
- <div id='footer-legal'> |
143 |
+ <div id='footer-legal'> |
144 |
openQA is licensed <%= link_to 'GPL-2.0' => 'https://github.com/os-autoinst/openQA' %> |
145 |
- </div> |
146 |
- </div> |
147 |
+ </div> |
148 |
+ </div> |
149 |
</footer> |
150 |
</div> |
151 |
</body> |
152 |
-- |
153 |
2.5.0 |
154 |
|