Skip to content

将需要改动的部分替换为xxxx，将北京地图改为苏州 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
renfeng merged 1 commit into from
Sep 28, 2014
Merged

将需要改动的部分替换为xxxx，将北京地图改为苏州 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions event-about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,26 @@
<section>
<img src="images/logo/developers-logo.svg" id="developers">
<p>DevFest 是 Google 赞助发起的全球性开发者活动，活动内容完全由世界各地的 GDG 社区志愿者自行策划组织。
<<<<<<< HEAD
DevFest Suzhou 是由苏州 GDG 社区组织的大型开发者活动，XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
大会主页见<a href="http://devfest2014.dushu.hu/">这里</a>。</p>
<p id="contact">本次活动由组织者 <a href="https://plus.google.com/+GuokaiHan/posts">XXXXXXXXXXXXX</a> 负责，如需联系请邮件 XXXXXXXXXXXXX 。</p>
=======
DevFest Beijing 是由北京 GDG 社区组织的大型开发者活动，从2012年至今已是第三次举办。2013 DevFest Beijing 有近500人参加，
大会主页见<a href="http://devfest.bjgdg.org/">这里</a>。</p>
<p id="contact">本次活动由组织者 <a href="https://plus.google.com/+GuokaiHan/posts">Jackie Han</a> 负责，如需联系请邮件 han.guokai<#>gmail.com 。</p>
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
</section>
<section>
<img src="images/logo/BJ_GDG_Logo.jpg">
<p>GDG , 即 Google Developer Groups 或 谷歌开发者社区，是谷歌开发者部门发起的全球项目。
GDG 是面向对 Google 和开源、开放技术感兴趣的公益性开发者社区，内容涵盖 Web/Chrome、Android 和其它 Google API 等。
</p>
<<<<<<< HEAD
<p>苏州 GDG 是XXXXXXGDG 社区，活动完全由志愿者自行组织，常年举办各种线下技术交流活动。欢迎加入苏州 GDG 社区！
=======
<p>北京 GDG 是国内最早成立的 GDG 社区，活动完全由志愿者自行组织，常年举办各种线下技术交流活动。欢迎加入北京 GDG 社区！
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
</p>
</section>
</template>
Expand Down
19 changes: 19 additions & 0 deletions event-footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,24 @@
color: #777;
}
</style>
<<<<<<< HEAD
<!-- 改链接 -->
<div id="follow" layout horizontal center-justified wrap>
<!-- 改链接 -->
<a href="https://plus.google.com/+GdgbeijingOrg/posts"><img src="images/icons/gplus.png"><span>&nbsp;Google+</span></a>
<!-- 改链接 -->
<a href="https://groups.google.com/forum/?fromgroups#!forum/beijing-gtug"><img src="images/icons/groups.png"><span>&nbsp;邮件列表</span></a>
<!-- 改链接 -->
<a href="http://www.chinagdg.com/forum-2-1.html"><img src="images/icons/discuz.jpg"><span>&nbsp;国内论坛</span></a>
<!-- 改链接 -->
<a href="images/img/wechat_qrcode.jpg"><img src="images/icons/weixin.png"><span>&nbsp;GDG_Suzhou</span></a>
<!-- 改链接 -->
<a href="http://weibo.com/gtug"><img src="images/icons/weibo.png"><span>&nbsp;@苏州GDG</span></a>
<!-- 改链接 -->
<a href="https://github.com/gdgbeijing"><img src="images/icons/github.png"><span>&nbsp;/gdgsuzhou</span></a>
</div>
<footer layout horizontal center-justified>&copy; 2014 苏州GDG</footer>
=======
<div id="follow" layout horizontal center-justified wrap>
<a href="https://plus.google.com/+GdgbeijingOrg/posts"><img src="images/icons/gplus.png"><span>&nbsp;Google+</span></a>
<a href="https://groups.google.com/forum/?fromgroups#!forum/beijing-gtug"><img src="images/icons/groups.png"><span>&nbsp;邮件列表</span></a>
Expand All @@ -34,5 +52,6 @@
<a href="https://github.com/gdgbeijing"><img src="images/icons/github.png"><span>&nbsp;/gdgbeijing</span></a>
</div>
<footer layout horizontal center-justified>&copy; 2014 北京GDG</footer>
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
</template>
</polymer-element>
37 changes: 37 additions & 0 deletions event-home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,44 +68,81 @@
</style>
<div id="home-container">
<div id="home-banner">
<<<<<<< HEAD
<img id="devfest_season" src="images/logo/DevFest_Season.svg" alt="GDG Suzhou DevFest 2014 Season">
</div>
<div vertical layout center>
<p>2014年10月18日，苏州 GDG 大型开发者活动 DevFest，全天XX场 XX和 XX。</p>
<p>最纯净的技术内容，由社区志愿者独立组织，一个属于开发者自己的节日。</p>
<div>
<!-- 改链接 -->
=======
<img id="devfest_season" src="images/logo/DevFest_Season.svg" alt="GDG Beijing DevFest 2014 Season">
</div>
<div vertical layout center>
<p>2014年10月26日，北京 GDG 大型开发者活动 DevFest，全天17场 Session 和 Codelab。</p>
<p>最纯净的技术内容，由社区志愿者独立组织，一个属于开发者自己的节日。</p>
<div>
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
<a href="https://gdgdocs.org/forms/d/1hsS_wndqwd05couUrMoELI-hAAvzlqnXvk64zbdNmUk/viewform" target="_blank"><paper-button raisedButton class="colored" label="免费报名"></paper-button></a>
</div>
</div>
<section>
<div class="home_panel" layout horizontal wrap center>
<div>
<<<<<<< HEAD
<h2>XXXXXX 技术分会场</h2>
<p>Android XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX。</p>
</div>
<!-- 改链接 -->
=======
<h2>Android 技术分会场</h2>
<p>Android 技术专场聚焦 Android Wear、Material Design、Android L 等新技术，以及开发工具和开发经验的分享。</p>
</div>
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
<div horizontal center-justified layout><img src="images/logo/Wear_Google.png"></div>
</div>
</section>
<section>
<div class="home_panel" layout horizontal wrap center>
<<<<<<< HEAD
<!-- 改链接 -->
<div horizontal center-justified layout><img src="images/logo/polymer.svg"></div>
<div>
<h2>xxx 技术分会场</h2>
<p>xxxx XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX。</p>
=======
<div horizontal center-justified layout><img src="images/logo/polymer.svg"></div>
<div>
<h2>Web 技术分会场</h2>
<p>Web 技术专场包括 Polymer 、跨设备响应式 Web 设计、HTML5、构建工具（如 Gulp/Grunt、Bower）、移动 Web 开发、UX/Design 等内容。</p>
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
</div>
</div>
</section>
<section>
<div class="home_panel" layout horizontal wrap center>
<div>
<<<<<<< HEAD
<h2>XXXXXXXX分会场</h2>
<p>XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX。</p>
<p>更多活动信息请参考左侧导航栏。</p>
</div>
<!-- 改链接 -->
=======
<h2>Codelab 分会场</h2>
<p>本次活动为喜欢动手的同学单独准备了一个半天 Codelab 会议室，边学边用，快速上手体验新技术。包括 Polymer、 Android Wear Codelab 。</p>
<p>更多活动信息请参考左侧导航栏。</p>
</div>
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
<div horizontal center-justified layout><img style="height: 70%" src="images/logo/codelab.jpg"></div>
</div>
</section>
<section>
<<<<<<< HEAD
<!-- 改链接 -->
=======
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
<img src="images/logo/products.png" style="width:100%">
</section>
</div>
Expand Down
33 changes: 33 additions & 0 deletions event-map.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
<!-- Change this to standard google-map.html in bower_components folder if you are not in China-->
<link rel="import" href="google-map/google-map.html">

<<<<<<< HEAD

=======
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
<polymer-element name="event-map" noscript>
<template>
<style>
Expand Down Expand Up @@ -35,6 +39,34 @@
</style>
<core-header-panel flex>
<div id="description" class="core-header">
<<<<<<< HEAD
<p><core-icon icon="alarm"></core-icon>活动时间：10月18日，X:00-X:00。</p>
<p><core-icon icon="maps:place"></core-icon>活动地点：西交利物浦大学，第一、第二报告厅。</p>
<p><core-icon icon="maps:directions-bus"></core-icon>乘车路线：XXXXXXXXXXX。</p>
</div>


<google-map id="map" fit
latitude="31.274677"
longitude="120.738121"

zoom="16">
<google-map-marker
latitude="31.274677"
longitude="120.738121"
icon="images/icons/spotlight-poi.png">
<p><core-icon icon="account-balance"></core-icon>主会场：西交利物浦大学中心楼</p>
<p>XXXXXXXXX</p>
<p>X:00-X:00</p>
</google-map-marker>

<google-map-marker
latitude="31.275711"
longitude="120.741219"
icon="images/icons/spotlight-poi.png">
<p><core-icon icon="maps:local-restaurant"></core-icon>下车地点：西交大站</p>
<p>x:xx-xx:xx</p>
=======
<p><core-icon icon="alarm"></core-icon>活动时间：10月26日，9:00-18:00。</p>
<p><core-icon icon="maps:place"></core-icon>活动地点：北航新主楼，第一、第二报告厅。</p>
<p><core-icon icon="maps:directions-bus"></core-icon>乘车路线：地铁10号线西土城站，向北走300米。</p>
Expand All @@ -60,6 +92,7 @@
icon="images/icons/spotlight-poi.png">
<p><core-icon icon="maps:local-restaurant"></core-icon>午餐地点：北航培训餐厅3楼</p>
<p>12:40-13:00</p>
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
</google-map-marker>
</google-map>
</core-header-panel>
Expand Down
78 changes: 78 additions & 0 deletions event-schedule.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,24 +77,101 @@
</style>
<div class="container">
<h1>日程安排</h1>
<<<<<<< HEAD
<p>本次活动由xxxxxxxxxxx分会场组成。Android 和 Web 会场是xxxxxxx，也是本次活动的主会场。xxxxxxxxx。</p>
=======
<p>本次活动由 Android 、Web 和 Codelab 三个分会场组成。Android 和 Web 会场是两个大型阶梯教室，也是本次活动的主会场。Codelab 是小型会议室，仅下午开放。</p>
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
<p>内容安排持续更新中，敬请关注。</p>
<table>
<thead>
<tr>
<th>时间</th>
<<<<<<< HEAD
<th>xxxx 分会场</th>
<th>xxxx 分会场</th>
<th>xxxx 分会场</th>
=======
<th>Android 分会场</th>
<th>Web 分会场</th>
<th>Codelab 分会场</th>
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
</tr>
</thead>
<tbody>
<tr>
<<<<<<< HEAD
<td class="time">x:xx</td>
=======
<td class="time">8:30</td>
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
<td colspan="2">签到入场</td>
<td rowspan="6" class="nosession">-</td>
</tr>
<tr>
<<<<<<< HEAD
<td class="time">x:xx</td>
<td colspan="2">开场介绍</td>
</tr>
<tr>
<td class="time">xx:xx</td>
<!-- 改链接 -->
<td><img src="images/icons/android.svg">xxxxxx</td>
<!-- 改链接 -->
<td><img src="images/icons/chrome.svg">xxxxx xxx</td>
</tr>
<tr>
<td class="time">10:50</td>
<!-- 改链接 -->
<td><img src="images/icons/android.svg">xxxxx</td>
<!-- 改链接 -->
<td><img src="images/icons/chrome.svg">xxxx</td>
</tr>
<tr>
<td class="time">xx:xx</td>
<!-- 改链接 -->
<td colspan="2" class="break"><core-icon icon="maps:local-restaurant"></core-icon>xxx</td>
</tr>
<tr>
<td class="time">xx:xx</td>
<!-- 改链接 -->
<td><img src="images/icons/android.svg">xxxxxx</td>
<td><img src="images/icons/chrome.svg">xxxx</td>
</tr>
<tr>
<td class="time">xx:xx</td>
<!-- 改链接 -->
<td><img src="images/icons/android.svg">xxx</td>
<td><img src="images/icons/chrome.svg">xx</td>
<td><img src="images/icons/laboratory.png">xxxxx</td>
</tr>
<tr>
<td class="time">14:40</td>
<td colspan=3 class="break"><core-icon icon="maps:local-cafe"></core-icon>xxxxx</td>
</tr>
<tr>
<td class="time">xx:xx/td>
<!-- 改链接 -->
<td><img src="images/icons/android.svg">xxx</td>
<td><img src="images/icons/chrome.svg">xx</td>
<td><img src="images/icons/laboratory.png">xxxxx</td>
</tr>
<tr>
<td class="time">xx:xx</td>
<td><img src="images/icons/android.svg">xxx</td>
<td><img src="images/icons/chrome.svg">xx</td>
<td><img src="images/icons/laboratory.png">xx</td>
</tr>
<tr>
<td class="time">16:40</td>
<td><img src="images/icons/android.svg">xxxx</td>
<td><img src="images/icons/chrome.svg">xxx</td>
<td class="nosession">-</td>
</tr>
<tr>
<td class="time">xx:xx</td>
<td colspan=3>xxxxx</td>
=======
<td class="time">9:30</td>
<td colspan="2">开场介绍</td>
</tr>
Expand Down Expand Up @@ -148,6 +225,7 @@ <h1>日程安排</h1>
<tr>
<td class="time">17:30</td>
<td colspan=3>大会结束</td>
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
</tr>
</tbody>
</table>
Expand Down
14 changes: 14 additions & 0 deletions event-thanks.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,34 @@
<h2>支持单位：</h2>
<figure>
<img id="google" src="images/logo/google_logo.svg">
<<<<<<< HEAD
<figcaption>本次活动由 xxxx 独家赞助。</figcaption>
=======
<figcaption>本次活动由 Google 独家赞助。</figcaption>
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
</figure>

<figure>
<img id="BHsoft" src="images/logo/BHsoft.png">
<<<<<<< HEAD
<figcaption>感谢xxxxxx对本次活动的工作支持。</figcaption>
=======
<figcaption>感谢北航软件学院对本次活动的工作支持。</figcaption>
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
</figure>
</section>
<section>
<h2>志愿者名单：</h2>
<ul>
<<<<<<< HEAD
<li>xxxxxxxx
<li>xxxxxx</li>
<li>xxxxxx</li>
=======
<li>韩国恺，活动负责人兼网站制作</li>
<li>江昪，协助组织</li>
<li>王玮，协助组织</li>
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
</ul>
<p>本次活动完全由志愿者组织，所有志愿者名单都将出现在这里！</p>
</section>
Expand Down
4 changes: 4 additions & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,11 @@
</core-header-panel>

<div tool >
<<<<<<< HEAD
<span>2014 DevFest Suzhou</span>
=======
<span>2014 DevFest Beijing</span>
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
</div>

<div id="content-container" fit vertical layout>
Expand Down
4 changes: 4 additions & 0 deletions main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@ function hash_nav() {
map.async(function(){
map.resize();
if(map.map) { // map has ready
<<<<<<< HEAD
map.map.setCenter(new google.maps.LatLng(31.274677,120.738121),1)
=======
map.map.setCenter(new google.maps.LatLng(39.980887,116.352079),1)
>>>>>>> 95f2856755b8548b554b7338726f1a52e0ca2c91
}
});
}
Expand Down
Loading