Skip to content

Commit 53694ed

Browse files
renfengrenfeng
committed
Merge pull request #1 from DerekGrant/master
将需要改动的部分替换为xxxx，将北京地图改为苏州
2 parents 95f2856 + 10cc30d commit 53694ed

10 files changed

+353
-0
lines changed

‎event-about.html

+10
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,26 @@
2626
<section>
2727
<img src="images/logo/developers-logo.svg" id="developers">
2828
<p>DevFest 是 Google 赞助发起的全球性开发者活动，活动内容完全由世界各地的 GDG 社区志愿者自行策划组织。
29+
<<<<<<< HEAD
30+
DevFest Suzhou 是由苏州 GDG 社区组织的大型开发者活动，XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
31+
大会主页见<a href="http://devfest2014.dushu.hu/">这里</a>。</p>
32+
<p id="contact">本次活动由组织者 <a href="https://plus.google.com/+GuokaiHan/posts">XXXXXXXXXXXXX</a> 负责，如需联系请邮件 XXXXXXXXXXXXX 。</p>
33+
=======
2934
DevFest Beijing 是由北京 GDG 社区组织的大型开发者活动，从2012年至今已是第三次举办。2013 DevFest Beijing 有近500人参加，
3035
大会主页见<a href="http://devfest.bjgdg.org/">这里</a>。</p>
3136
<p id="contact">本次活动由组织者 <a href="https://plus.google.com/+GuokaiHan/posts">Jackie Han</a> 负责，如需联系请邮件 han.guokai<#>gmail.com 。</p>
37+
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
3238
</section>
3339
<section>
3440
<img src="images/logo/BJ_GDG_Logo.jpg">
3541
<p>GDG , 即 Google Developer Groups 或 谷歌开发者社区，是谷歌开发者部门发起的全球项目。
3642
GDG 是面向对 Google 和开源、开放技术感兴趣的公益性开发者社区，内容涵盖 Web/Chrome、Android 和其它 Google API 等。
3743
</p>
44+
<<<<<<< HEAD
45+
<p>苏州 GDG 是XXXXXXGDG 社区，活动完全由志愿者自行组织，常年举办各种线下技术交流活动。欢迎加入苏州 GDG 社区！
46+
=======
3847
<p>北京 GDG 是国内最早成立的 GDG 社区，活动完全由志愿者自行组织，常年举办各种线下技术交流活动。欢迎加入北京 GDG 社区！
48+
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
3949
</p>
4050
</section>
4151
</template>

‎event-footer.html

+19
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,24 @@
2525
color: #777;
2626
}
2727
</style>
28+
<<<<<<< HEAD
29+
<!-- 改链接 -->
30+
<div id="follow" layout horizontal center-justified wrap>
31+
<!-- 改链接 -->
32+
<a href="https://plus.google.com/+GdgbeijingOrg/posts"><img src="images/icons/gplus.png"><span>&nbsp;Google+</span></a>
33+
<!-- 改链接 -->
34+
<a href="https://groups.google.com/forum/?fromgroups#!forum/beijing-gtug"><img src="images/icons/groups.png"><span>&nbsp;邮件列表</span></a>
35+
<!-- 改链接 -->
36+
<a href="http://www.chinagdg.com/forum-2-1.html"><img src="images/icons/discuz.jpg"><span>&nbsp;国内论坛</span></a>
37+
<!-- 改链接 -->
38+
<a href="images/img/wechat_qrcode.jpg"><img src="images/icons/weixin.png"><span>&nbsp;GDG_Suzhou</span></a>
39+
<!-- 改链接 -->
40+
<a href="http://weibo.com/gtug"><img src="images/icons/weibo.png"><span>&nbsp;@苏州GDG</span></a>
41+
<!-- 改链接 -->
42+
<a href="https://github.com/gdgbeijing"><img src="images/icons/github.png"><span>&nbsp;/gdgsuzhou</span></a>
43+
</div>
44+
<footer layout horizontal center-justified>&copy; 2014 苏州GDG</footer>
45+
=======
2846
<div id="follow" layout horizontal center-justified wrap>
2947
<a href="https://plus.google.com/+GdgbeijingOrg/posts"><img src="images/icons/gplus.png"><span>&nbsp;Google+</span></a>
3048
<a href="https://groups.google.com/forum/?fromgroups#!forum/beijing-gtug"><img src="images/icons/groups.png"><span>&nbsp;邮件列表</span></a>
@@ -34,5 +52,6 @@
3452
<a href="https://github.com/gdgbeijing"><img src="images/icons/github.png"><span>&nbsp;/gdgbeijing</span></a>
3553
</div>
3654
<footer layout horizontal center-justified>&copy; 2014 北京GDG</footer>
55+
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
3756
</template>
3857
</polymer-element>

‎event-home.html

+37
Original file line numberDiff line numberDiff line change
@@ -68,44 +68,81 @@
6868
</style>
6969
<div id="home-container">
7070
<div id="home-banner">
71+
<<<<<<< HEAD
72+
<img id="devfest_season" src="images/logo/DevFest_Season.svg" alt="GDG Suzhou DevFest 2014 Season">
73+
</div>
74+
<div vertical layout center>
75+
<p>2014年10月18日，苏州 GDG 大型开发者活动 DevFest，全天XX场 XX和 XX。</p>
76+
<p>最纯净的技术内容，由社区志愿者独立组织，一个属于开发者自己的节日。</p>
77+
<div>
78+
<!-- 改链接 -->
79+
=======
7180
<img id="devfest_season" src="images/logo/DevFest_Season.svg" alt="GDG Beijing DevFest 2014 Season">
7281
</div>
7382
<div vertical layout center>
7483
<p>2014年10月26日，北京 GDG 大型开发者活动 DevFest，全天17场 Session 和 Codelab。</p>
7584
<p>最纯净的技术内容，由社区志愿者独立组织，一个属于开发者自己的节日。</p>
7685
<div>
86+
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
7787
<a href="https://gdgdocs.org/forms/d/1hsS_wndqwd05couUrMoELI-hAAvzlqnXvk64zbdNmUk/viewform" target="_blank"><paper-button raisedButton class="colored" label="免费报名"></paper-button></a>
7888
</div>
7989
</div>
8090
<section>
8191
<div class="home_panel" layout horizontal wrap center>
8292
<div>
93+
<<<<<<< HEAD
94+
<h2>XXXXXX 技术分会场</h2>
95+
<p>Android XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX。</p>
96+
</div>
97+
<!-- 改链接 -->
98+
=======
8399
<h2>Android 技术分会场</h2>
84100
<p>Android 技术专场聚焦 Android Wear、Material Design、Android L 等新技术，以及开发工具和开发经验的分享。</p>
85101
</div>
102+
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
86103
<div horizontal center-justified layout><img src="images/logo/Wear_Google.png"></div>
87104
</div>
88105
</section>
89106
<section>
90107
<div class="home_panel" layout horizontal wrap center>
108+
<<<<<<< HEAD
109+
<!-- 改链接 -->
110+
<div horizontal center-justified layout><img src="images/logo/polymer.svg"></div>
111+
<div>
112+
<h2>xxx 技术分会场</h2>
113+
<p>xxxx XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX。</p>
114+
=======
91115
<div horizontal center-justified layout><img src="images/logo/polymer.svg"></div>
92116
<div>
93117
<h2>Web 技术分会场</h2>
94118
<p>Web 技术专场包括 Polymer 、跨设备响应式 Web 设计、HTML5、构建工具（如 Gulp/Grunt、Bower）、移动 Web 开发、UX/Design 等内容。</p>
119+
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
95120
</div>
96121
</div>
97122
</section>
98123
<section>
99124
<div class="home_panel" layout horizontal wrap center>
100125
<div>
126+
<<<<<<< HEAD
127+
<h2>XXXXXXXX分会场</h2>
128+
<p>XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX。</p>
129+
<p>更多活动信息请参考左侧导航栏。</p>
130+
</div>
131+
<!-- 改链接 -->
132+
=======
101133
<h2>Codelab 分会场</h2>
102134
<p>本次活动为喜欢动手的同学单独准备了一个半天 Codelab 会议室，边学边用，快速上手体验新技术。包括 Polymer、 Android Wear Codelab 。</p>
103135
<p>更多活动信息请参考左侧导航栏。</p>
104136
</div>
137+
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
105138
<div horizontal center-justified layout><img style="height: 70%" src="images/logo/codelab.jpg"></div>
106139
</div>
107140
</section>
108141
<section>
142+
<<<<<<< HEAD
143+
<!-- 改链接 -->
144+
=======
145+
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
109146
<img src="images/logo/products.png" style="width:100%">
110147
</section>
111148
</div>

‎event-map.html

+33
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
<!-- Change this to standard google-map.html in bower_components folder if you are not in China-->
66
<link rel="import" href="google-map/google-map.html">
77

8+
<<<<<<< HEAD
9+
10+
=======
11+
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
812
<polymer-element name="event-map" noscript>
913
<template>
1014
<style>
@@ -35,6 +39,34 @@
3539
</style>
3640
<core-header-panel flex>
3741
<div id="description" class="core-header">
42+
<<<<<<< HEAD
43+
<p><core-icon icon="alarm"></core-icon>活动时间：10月18日，X:00-X:00。</p>
44+
<p><core-icon icon="maps:place"></core-icon>活动地点：西交利物浦大学，第一、第二报告厅。</p>
45+
<p><core-icon icon="maps:directions-bus"></core-icon>乘车路线：XXXXXXXXXXX。</p>
46+
</div>
47+
48+
49+
<google-map id="map" fit
50+
latitude="31.274677"
51+
longitude="120.738121"
52+
53+
zoom="16">
54+
<google-map-marker
55+
latitude="31.274677"
56+
longitude="120.738121"
57+
icon="images/icons/spotlight-poi.png">
58+
<p><core-icon icon="account-balance"></core-icon>主会场：西交利物浦大学中心楼</p>
59+
<p>XXXXXXXXX</p>
60+
<p>X:00-X:00</p>
61+
</google-map-marker>
62+
63+
<google-map-marker
64+
latitude="31.275711"
65+
longitude="120.741219"
66+
icon="images/icons/spotlight-poi.png">
67+
<p><core-icon icon="maps:local-restaurant"></core-icon>下车地点：西交大站</p>
68+
<p>x:xx-xx:xx</p>
69+
=======
3870
<p><core-icon icon="alarm"></core-icon>活动时间：10月26日，9:00-18:00。</p>
3971
<p><core-icon icon="maps:place"></core-icon>活动地点：北航新主楼，第一、第二报告厅。</p>
4072
<p><core-icon icon="maps:directions-bus"></core-icon>乘车路线：地铁10号线西土城站，向北走300米。</p>
@@ -60,6 +92,7 @@
6092
icon="images/icons/spotlight-poi.png">
6193
<p><core-icon icon="maps:local-restaurant"></core-icon>午餐地点：北航培训餐厅3楼</p>
6294
<p>12:40-13:00</p>
95+
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
6396
</google-map-marker>
6497
</google-map>
6598
</core-header-panel>

‎event-schedule.html

+78
Original file line numberDiff line numberDiff line change
@@ -77,24 +77,101 @@
7777
</style>
7878
<div class="container">
7979
<h1>日程安排</h1>
80+
<<<<<<< HEAD
81+
<p>本次活动由xxxxxxxxxxx分会场组成。Android 和 Web 会场是xxxxxxx，也是本次活动的主会场。xxxxxxxxx。</p>
82+
=======
8083
<p>本次活动由 Android 、Web 和 Codelab 三个分会场组成。Android 和 Web 会场是两个大型阶梯教室，也是本次活动的主会场。Codelab 是小型会议室，仅下午开放。</p>
84+
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
8185
<p>内容安排持续更新中，敬请关注。</p>
8286
<table>
8387
<thead>
8488
<tr>
8589
<th>时间</th>
90+
<<<<<<< HEAD
91+
<th>xxxx 分会场</th>
92+
<th>xxxx 分会场</th>
93+
<th>xxxx 分会场</th>
94+
=======
8695
<th>Android 分会场</th>
8796
<th>Web 分会场</th>
8897
<th>Codelab 分会场</th>
98+
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
8999
</tr>
90100
</thead>
91101
<tbody>
92102
<tr>
103+
<<<<<<< HEAD
104+
<td class="time">x:xx</td>
105+
=======
93106
<td class="time">8:30</td>
107+
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
94108
<td colspan="2">签到入场</td>
95109
<td rowspan="6" class="nosession">-</td>
96110
</tr>
97111
<tr>
112+
<<<<<<< HEAD
113+
<td class="time">x:xx</td>
114+
<td colspan="2">开场介绍</td>
115+
</tr>
116+
<tr>
117+
<td class="time">xx:xx</td>
118+
<!-- 改链接 -->
119+
<td><img src="images/icons/android.svg">xxxxxx</td>
120+
<!-- 改链接 -->
121+
<td><img src="images/icons/chrome.svg">xxxxx xxx</td>
122+
</tr>
123+
<tr>
124+
<td class="time">10:50</td>
125+
<!-- 改链接 -->
126+
<td><img src="images/icons/android.svg">xxxxx</td>
127+
<!-- 改链接 -->
128+
<td><img src="images/icons/chrome.svg">xxxx</td>
129+
</tr>
130+
<tr>
131+
<td class="time">xx:xx</td>
132+
<!-- 改链接 -->
133+
<td colspan="2" class="break"><core-icon icon="maps:local-restaurant"></core-icon>xxx</td>
134+
</tr>
135+
<tr>
136+
<td class="time">xx:xx</td>
137+
<!-- 改链接 -->
138+
<td><img src="images/icons/android.svg">xxxxxx</td>
139+
<td><img src="images/icons/chrome.svg">xxxx</td>
140+
</tr>
141+
<tr>
142+
<td class="time">xx:xx</td>
143+
<!-- 改链接 -->
144+
<td><img src="images/icons/android.svg">xxx</td>
145+
<td><img src="images/icons/chrome.svg">xx</td>
146+
<td><img src="images/icons/laboratory.png">xxxxx</td>
147+
</tr>
148+
<tr>
149+
<td class="time">14:40</td>
150+
<td colspan=3 class="break"><core-icon icon="maps:local-cafe"></core-icon>xxxxx</td>
151+
</tr>
152+
<tr>
153+
<td class="time">xx:xx/td>
154+
<!-- 改链接 -->
155+
<td><img src="images/icons/android.svg">xxx</td>
156+
<td><img src="images/icons/chrome.svg">xx</td>
157+
<td><img src="images/icons/laboratory.png">xxxxx</td>
158+
</tr>
159+
<tr>
160+
<td class="time">xx:xx</td>
161+
<td><img src="images/icons/android.svg">xxx</td>
162+
<td><img src="images/icons/chrome.svg">xx</td>
163+
<td><img src="images/icons/laboratory.png">xx</td>
164+
</tr>
165+
<tr>
166+
<td class="time">16:40</td>
167+
<td><img src="images/icons/android.svg">xxxx</td>
168+
<td><img src="images/icons/chrome.svg">xxx</td>
169+
<td class="nosession">-</td>
170+
</tr>
171+
<tr>
172+
<td class="time">xx:xx</td>
173+
<td colspan=3>xxxxx</td>
174+
=======
98175
<td class="time">9:30</td>
99176
<td colspan="2">开场介绍</td>
100177
</tr>
@@ -148,6 +225,7 @@ <h1>日程安排</h1>
148225
<tr>
149226
<td class="time">17:30</td>
150227
<td colspan=3>大会结束</td>
228+
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
151229
</tr>
152230
</tbody>
153231
</table>

‎event-thanks.html

+14
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,34 @@
3636
<h2>支持单位：</h2>
3737
<figure>
3838
<img id="google" src="images/logo/google_logo.svg">
39+
<<<<<<< HEAD
40+
<figcaption>本次活动由 xxxx 独家赞助。</figcaption>
41+
=======
3942
<figcaption>本次活动由 Google 独家赞助。</figcaption>
43+
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
4044
</figure>
4145

4246
<figure>
4347
<img id="BHsoft" src="images/logo/BHsoft.png">
48+
<<<<<<< HEAD
49+
<figcaption>感谢xxxxxx对本次活动的工作支持。</figcaption>
50+
=======
4451
<figcaption>感谢北航软件学院对本次活动的工作支持。</figcaption>
52+
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
4553
</figure>
4654
</section>
4755
<section>
4856
<h2>志愿者名单：</h2>
4957
<ul>
58+
<<<<<<< HEAD
59+
<li>xxxxxxxx
60+
<li>xxxxxx</li>
61+
<li>xxxxxx</li>
62+
=======
5063
<li>韩国恺，活动负责人兼网站制作</li>
5164
<li>江昪，协助组织</li>
5265
<li>王玮，协助组织</li>
66+
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
5367
</ul>
5468
<p>本次活动完全由志愿者组织，所有志愿者名单都将出现在这里！</p>
5569
</section>

‎index.html

+4
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,11 @@
4949
</core-header-panel>
5050

5151
<div tool >
52+
<<<<<<< HEAD
53+
<span>2014 DevFest Suzhou</span>
54+
=======
5255
<span>2014 DevFest Beijing</span>
56+
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
5357
</div>
5458

5559
<div id="content-container" fit vertical layout>

‎main.js

+4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@ function hash_nav() {
2727
map.async(function(){
2828
map.resize();
2929
if(map.map) { // map has ready
30+
<<<<<<< HEAD
31+
map.map.setCenter(new google.maps.LatLng(31.274677,120.738121),1)
32+
=======
3033
map.map.setCenter(new google.maps.LatLng(39.980887,116.352079),1)
34+
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
3135
}
3236
});
3337
}

0 commit comments

Comments
 (0)