Skip to content
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

将https://改为// #3

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

将https://改为// #3

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c0f37c5
fixed version
renfeng Sep 23, 2014
39795a3
添加了中文说明
renfeng Sep 23, 2014
3ec6438
Update README.md
renfeng Sep 23, 2014
2608b9c
Update README.md
renfeng Sep 23, 2014
95f2856
Update README.md
renfeng Sep 23, 2014
10cc30d
将需要改动的部分替换为xxxx，将北京地图改为苏州
DerekGrant Sep 28, 2014
53694ed
Merge pull request #1 from DerekGrant/master
renfeng Sep 28, 2014
7b3c5b2
去除冲突标签
DerekGrant Sep 28, 2014
ba29241
Merge branch 'master' of https://github.com/DerekGrant/devfest2014
renfeng Sep 28, 2014
6b1dd44
修改google-apis https:// 为//
DerekGrant Sep 28, 2014
9b4fa6b
Merge branch 'master' of https://github.com/DerekGrant/devfest2014
renfeng Sep 28, 2014
ae362fa
fixed https reverse proxy problem by replacing maps.api.gdgdocs.org w…
renfeng Sep 29, 2014
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
30 changes: 30 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,33 @@
如何让这堆代码变成可以浏览的网站？

1. 下载

如果你正在GitHub上读这段文字，你可以用下面的git命令下载源代码（请将git clone后面的地址替换成你在浏览器地址栏中看到的实际地址）

git clone https://github.com/renfeng/devfest2014

如果你不用git，也可以找到“Download ZIP”按钮，点一下，将原文件打包下载。

2. 安装

不需要安装特殊的服务器软件。所有文件都是静态的（相对服务器端而言）。但是，需要安装一个特殊的目录，bower_components。

而安装这个目录，需要执行下面的一行命令（先别急着执行，请继续向下读）

bower install

要执行上一行命令，需要先执行

npm install -g bower

要执行上一行命令，需要先安装nodejs。见http://nodejs.org

3. 为了用Google Map，需要为你的域名设置专用的api key。

4. 将代码放在任何网站服务器下面，例如Apache HTTPd。

代码是从https://github.com/gdgbeijing/devfest2014 复制来的。下面是原作者的readme

devfest2014
===========

Expand Down
22 changes: 20 additions & 2 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
"name": "devfest2014",
"description": "",
"homepage": "",
"keywords": [
],
"keywords": [],
"author": "",
"private": true,
"dependencies": {
Expand All @@ -13,5 +12,24 @@
"core-animated-pages": "Polymer/core-animated-pages",
"paper-elements": "Polymer/paper-elements#master",
"google-map": "PolymerLabs/google-map"
},
"resolutions": {
"polymer": "master",
"core-style": "master",
"core-selector": "master",
"core-transition": "master",
"core-header-panel": "master",
"core-drawer-panel": "master",
"core-icon-button": "master",
"core-toolbar": "master",
"platform": "master",
"core-component-page": "master",
"core-selection": "master",
"core-meta": "master",
"core-media-query": "master",
"core-icons": "master",
"core-icon": "master",
"core-iconset-svg": "master",
"core-iconset": "master"
}
}
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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

目测是 merge 的时候出问题了吧

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

谢谢提示！这个问题在最新版本中应该已经解决了，现在是正常显示的

发自 Windows 邮件

发件人: Glow Chiang
发送时间: ‎2014‎年‎9‎月‎29‎日, ‎星期一 ‎10‎:‎32
收件人: gdgbeijing/devfest2014
抄送: DerekGrant

In event-about.html:

@@ -26,16 +26,26 @@



DevFest 是 Google 赞助发起的全球性开发者活动，活动内容完全由世界各地的 GDG 社区志愿者自行策划组织。
+<<<<<<< HEAD

目测是 merge 的时候出问题了吧

—
Reply to this email directly or view it on GitHub.

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
Loading