-
Notifications
You must be signed in to change notification settings - Fork 0
/
patch.diff
270 lines (267 loc) · 13 KB
/
patch.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
From 19265958d4f01c1a232df71cc933cdfc105bc894 Mon Sep 17 00:00:00 2001
From: Le Hung <[email protected]>
Date: Sun, 28 Feb 2016 20:14:19 +0700
Subject: [PATCH] edit page about
---
.idea/workspace.xml | 60 ++++++++++++++++++++++++-----------------
views/about.jade | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++
views/index.jade | 5 +++-
3 files changed, 117 insertions(+), 25 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 795804a..afaa59c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -24,18 +24,18 @@
<file leaf-file-name="layout.jade" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/views/layout.jade">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-8.888889">
- <caret line="12" column="11" selection-start-line="12" selection-start-column="11" selection-end-line="12" selection-end-column="11" />
+ <state vertical-scroll-proportion="-9.62963">
+ <caret line="13" column="51" selection-start-line="13" selection-start-column="51" selection-end-line="13" selection-end-column="51" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="index.jade" pinned="false" current-in-tab="true">
+ <file leaf-file-name="index.jade" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/views/index.jade">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.5714286">
- <caret line="69" column="80" selection-start-line="69" selection-start-column="80" selection-end-line="69" selection-end-column="80" />
+ <state vertical-scroll-proportion="-10.37037">
+ <caret line="76" column="41" selection-start-line="3" selection-start-column="4" selection-end-line="76" selection-end-column="41" />
<folding />
</state>
</provider>
@@ -75,7 +75,7 @@
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="30" column="25" selection-start-line="30" selection-start-column="25" selection-end-line="30" selection-end-column="25" />
+ <caret line="50" column="15" selection-start-line="50" selection-start-column="15" selection-end-line="50" selection-end-column="15" />
<folding />
</state>
</provider>
@@ -91,11 +91,11 @@
</provider>
</entry>
</file>
- <file leaf-file-name="about.jade" pinned="false" current-in-tab="false">
+ <file leaf-file-name="about.jade" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/views/about.jade">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-0.0">
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <state vertical-scroll-proportion="0.61904764">
+ <caret line="67" column="22" selection-start-line="67" selection-start-column="18" selection-end-line="67" selection-end-column="22" />
<folding />
</state>
</provider>
@@ -140,6 +140,7 @@
<option value="$PROJECT_DIR$/views/error.jade" />
<option value="$PROJECT_DIR$/public/stylesheets/style.css" />
<option value="$PROJECT_DIR$/views/index.jade" />
+ <option value="$PROJECT_DIR$/views/about.jade" />
</list>
</option>
</component>
@@ -368,6 +369,9 @@
</recent_temporary>
</component>
<component name="ShelveChangesManager" show_recycled="false" />
+ <component name="SvnConfiguration">
+ <configuration />
+ </component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="76087a92-aea6-490b-b260-40d8e27f2cc3" name="Default" comment="" />
@@ -399,6 +403,14 @@
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
</layout>
</component>
+ <component name="Vcs.Log.UiProperties">
+ <option name="RECENTLY_FILTERED_USER_GROUPS">
+ <collection />
+ </option>
+ <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
+ <collection />
+ </option>
+ </component>
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
@@ -439,10 +451,10 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/bin/www">
+ <entry file="file://$PROJECT_DIR$/public/stylesheets/style.css">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="50" column="0" selection-start-line="50" selection-start-column="0" selection-end-line="50" selection-end-column="0" />
+ <state vertical-scroll-proportion="-3.2142856">
+ <caret line="9" column="19" selection-start-line="9" selection-start-column="19" selection-end-line="9" selection-end-column="19" />
<folding />
</state>
</provider>
@@ -455,10 +467,10 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app.js">
+ <entry file="file://$PROJECT_DIR$/bin/www">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="30" column="25" selection-start-line="30" selection-start-column="25" selection-end-line="30" selection-end-column="25" />
+ <caret line="50" column="0" selection-start-line="50" selection-start-column="0" selection-end-line="50" selection-end-column="0" />
<folding />
</state>
</provider>
@@ -471,18 +483,18 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/views/about.jade">
+ <entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <caret line="50" column="15" selection-start-line="50" selection-start-column="15" selection-end-line="50" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/layout.jade">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-8.888889">
- <caret line="12" column="11" selection-start-line="12" selection-start-column="11" selection-end-line="12" selection-end-column="11" />
+ <state vertical-scroll-proportion="-9.62963">
+ <caret line="13" column="51" selection-start-line="13" selection-start-column="51" selection-end-line="13" selection-end-column="51" />
<folding />
</state>
</provider>
@@ -495,18 +507,18 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/public/stylesheets/style.css">
+ <entry file="file://$PROJECT_DIR$/views/index.jade">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-3.2142856">
- <caret line="9" column="19" selection-start-line="9" selection-start-column="19" selection-end-line="9" selection-end-column="19" />
+ <state vertical-scroll-proportion="-10.37037">
+ <caret line="76" column="41" selection-start-line="3" selection-start-column="4" selection-end-line="76" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/views/index.jade">
+ <entry file="file://$PROJECT_DIR$/views/about.jade">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.5714286">
- <caret line="69" column="80" selection-start-line="69" selection-start-column="80" selection-end-line="69" selection-end-column="80" />
+ <state vertical-scroll-proportion="0.61904764">
+ <caret line="67" column="22" selection-start-line="67" selection-start-column="18" selection-end-line="67" selection-end-column="22" />
<folding />
</state>
</provider>
diff --git a/views/about.jade b/views/about.jade
index e69de29..299ef26 100644
--- a/views/about.jade
+++ b/views/about.jade
@@ -0,0 +1,77 @@
+extends layout
+
+block content
+ div.page-wrapper
+ nav.navbar.navbar-inverse.navbar-fixed-top
+ .container
+ // Brand and toggle get grouped for better mobile display
+ .navbar-header
+ button.navbar-toggle.collapsed(type='button', data-toggle='collapse', data-target='#bs-example-navbar-collapse-1', aria-expanded='false')
+ span.sr-only Toggle navigation
+ span.icon-bar
+ span.icon-bar
+ span.icon-bar
+ a.navbar-brand(href='#')
+ b Hello Nodejs
+ // Collect the nav links, forms, and other content for toggling
+ #bs-example-navbar-collapse-1.collapse.navbar-collapse
+ ul.nav.navbar-nav
+ li.active
+ a(href='/')
+ | Home
+ span.sr-only (current)
+ li
+ a(href='/about') About
+ li
+ a(href='/contact') Contact
+ li.dropdown
+ a.dropdown-toggle(href='#', data-toggle='dropdown', role='button', aria-haspopup='true', aria-expanded='false')
+ | Dropdown
+ span.caret
+ ul.dropdown-menu
+ li
+ a(href='#') Action
+ li
+ a(href='#') Another action
+ li
+ a(href='#') Something else here
+ li.divider(role='separator')
+ li
+ a(href='#') Separated link
+ li.divider(role='separator')
+ li
+ a(href='#') One more separated link
+ form.navbar-form.navbar-left(role='search')
+ .form-group
+ input.form-control(type='text', placeholder='Search')
+ ul.nav.navbar-nav.navbar-right
+ li
+ button.btn.btn-default.navbar-btn(href='#', type='button') Sign In
+ li.dropdown
+ a.dropdown-toggle(href='#', data-toggle='dropdown', role='button', aria-haspopup='true', aria-expanded='false')
+ | Dropdown
+ span.caret
+ ul.dropdown-menu
+ li
+ a(href='#') Action
+ li
+ a(href='#') Another action
+ li
+ a(href='#') Something else here
+ li.divider(role='separator')
+ li
+ a(href='#') Separated link
+
+ .container
+ .jumbotron
+ h1 About Nodejs!
+ p Fast, unopinionated, minimalist web framework for Node.js
+ p
+ a.btn.btn-primary.btn-lg(href='#', role='button') Learn more
+ footer(style="position:fixed;bottom:0;right:0;left:0")
+ hr
+ p.text-center Copyright © HungLeExpress
+ script(type='text/javascript').
+ (function (html) {
+ console.log(html);
+ })(document.documentElement);
\ No newline at end of file
diff --git a/views/index.jade b/views/index.jade
index bab2b18..69adeef 100644
--- a/views/index.jade
+++ b/views/index.jade
@@ -71,4 +71,7 @@ block content
footer(style="position:fixed;bottom:0;right:0;left:0")
hr
p.text-center Copyright © HungLeExpress
-
+ script(type='text/javascript').
+ (function(html){
+ console.log(html);
+ })(document.documentElement);
--
1.9.5.msysgit.0