Merge pull request #95 from youcon/ak

Open registration 2018
youcon · Aug 23, 2018 · bed061d · bed061d
2 parents 3cbb3bd + 3820421
commit bed061d
Show file tree

Hide file tree

Showing 9 changed files with 89 additions and 51 deletions.
diff --git a/_config.yml b/_config.yml
@@ -5,10 +5,10 @@ google_analytics: UA-62253510-1
 markdown: kramdown
 
 # This flag means that event is still in progress but registration is closed
-is_registration_open: false
+is_registration_open: true
 
 # This flag means that event is in progress, otherwise need to transform to cooming soon page
-is_in_progress: false
+is_in_progress: true
 
 previous_events:
     - name: "2015"

diff --git a/_includes/head.html b/_includes/head.html
@@ -70,3 +70,11 @@
         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
         <link href="static/css/style.css" rel="stylesheet">
         <link href="https://cdn-images.mailchimp.com/embedcode/horizontal-slim-10_7.css" rel="stylesheet" type="text/css">
+        <script type="text/javascript" async="async" defer="defer" charset="UTF-8" src="https://timepad.ru/js/tpwf/loader/min/loader.js" data-timepad-customized="28743" data-timepad-widget-v2="event_register">
+	(function(){return {"event":{"id":"790649"},"hidePreloading":true,"display": "popup",
+            "popup": {
+                "triggerSelector": ".twf"
+            }}; })();
+</script>
+
+
diff --git a/_includes/header.html b/_includes/header.html
@@ -29,14 +29,16 @@
                         <a href="#page-top"></a>
                     </li>
                     <li>
-                        <a class="page-scroll" href="#about">О конференции</a>
+                        <a class="page-scroll" href="#info">О конференции</a>
                     </li>
+                    {% comment %}
                     <li>
                         <a class="page-scroll" href="#schedule">Расписание</a>
                     </li>
                     <li>
                         <a class="page-scroll" href="#partners">Партнеры</a>
                     </li>
+                    {% endcomment %}
                     <li>
                         <a class="page-scroll" href="#team">Организаторы</a>
                     </li>
@@ -58,7 +60,7 @@ <h1 class="logo">
             <div class="intro-date">{{ site.event_city }} | {{ site.event_date }}</div>
             <div class="intro-heading">{{ site.event_location_name }}</div>
             {% if site.is_registration_open %}
-                <a href="#registration" class="page-scroll btn btn-xl reg">Регистрация</a>
+                <a href="#info" class="page-scroll btn btn-xl reg">О конференции</a>
             {% endif %}
             {% unless site.is_in_progress %}
                 <a href="#subscribe" class="page-scroll btn btn-xl reg">Подписаться</a>

diff --git a/_includes/section_about.html b/_includes/section_about.html
@@ -2,18 +2,16 @@
     <div class="container">
         <div class="row">
             <div class="col-lg-12">
-                <h2 class="section-heading">ЮКОН-2017</h2>
+                <h2 class="section-heading">ЮКОН-2018</h2>
                 <h3 class="section-subheading text-muted">
-                    <p>Осенью 2017 года в Саратове состоится ИТ-конференция!
+                    <p>Осенью 2018 года в Саратове состоится ИТ-конференция!
                         На одной площадке соберутся самые интересные докладчики,
                         которые расскажут тебе о тенденциях в области технологий,
                         разработки, продвижения и внедрения программного обеспечения,
                         а также, о том, как построить собственный бизнес в ИТ или создать
                         популярное Интернет-сообщество!
                         Разработчик, интернет-маркетолог и предприниматель – каждый найдет
                         для себя интересную секцию!
-                        <br><br>
-                        <span>УЧАСТИЕ В КОНФЕРЕНЦИИ - БЕСПЛАТНО! </span></p>
                 </h3>
             </div>
         </div>

diff --git a/_includes/section_contacts.html b/_includes/section_contacts.html
@@ -39,7 +39,7 @@ <h2 class="section-heading">Контакты</h2>
                     <a target="_blank" href="https://www.instagram.com/youconsaratov/"><i class="fa fa-instagram"></i></a>
                     <a target="_blank" href="https://github.com/youcon/youcon.github.io"><i class="fa fa-github-alt"></i></a>
                 </div>
-                <p class="copyright">Юкон &copy; 2017. ВСЕ ПРАВА ЗАЩИЩЕНЫ</p>
+                <p class="copyright">Юкон &copy; 2018. ВСЕ ПРАВА ЗАЩИЩЕНЫ</p>
             </div>
         </div>
     </div>

diff --git a/_includes/section_info.html b/_includes/section_info.html
@@ -0,0 +1,43 @@
+<section id="info">
+    <div class="container">
+        <div class="row">
+            <div class="col-lg-12">
+                <h2 class="section-heading"></h2>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-3 col-sm-6 col-xs-12">
+              <div class="info-block">
+                    1500+
+              </div>
+              <div class="info-underblock">
+                   участников 
+              </div>
+            </div>
+            <div class="col-md-3 col-sm-6 col-xs-12">
+              <div class="info-block">
+                    20
+              </div>
+              <div class="info-underblock">
+                   докладчиков 
+              </div>
+            </div>
+            <div class="col-md-3 col-sm-6 col-xs-12">
+              <div class="info-block">
+                   15
+              </div>
+              <div class="info-underblock">
+                  тематик докладов 
+              </div>
+            </div>
+            <div class="col-md-3 col-sm-6 col-xs-12">
+              <div class="info-block">
+                    4
+              </div>
+              <div class="info-underblock">
+                   конференция 
+              </div>
+            </div>
+        </div>
+    </div>
+</section>
diff --git a/_includes/section_registration.html b/_includes/section_registration.html
@@ -1,45 +1,8 @@
 <section id="registration" class="reg">
     <div class="container">
         <div class="row">
-            <div class="col-lg-12">
-                <h2 class="section-heading">Регистрация</h2>
-            </div>
-        </div>
-        <div id="success" class="row">
-            <div class="col-lg-12 success">
-                <h3>Регистрация успешно пройдена, на вашу электронную почту должно прийти подтверждение.</h3>
-            </div>
-        </div>
-        <div id="reg_form" class="row">
-            <div class="col-lg-12 form-box">
-                <form method="POST" action="https://reg.youcon.ru/reg/">
-                    <div class="row form-group">
-                        <div class="col-md-6 reg-input">
-                            <label for="full_name">Фамилия, Имя</label>
-                            <input type="text" name="full_name" maxlength="50"/>
-                        </div>
-                        <div class="col-md-6">
-                            <label for="email">E-mail</label>
-                            <input type="text" name="email" maxlength="50"/>
-                        </div>
-                    </div>
-                    <div class="row form-group">
-                        <div class="col-md-6 reg-input">
-                            <label for="company">Компания</label>
-                            <input type="text" name="company" maxlength="50"/>
-                        </div>
-                        <div class="col-md-6">
-                            <label for="bio">Должность</label>
-                            <input type="text" name="bio" maxlength="50"/>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-lg-12">
-                            <div id="success"></div>
-                            <button type="submit" class="btn btn-xl">Регистрация</button>
-                        </div>
-                    </div>
-                </form>
+            <div class="col-lg-12 reg-input">
+                <a href="#info" class="page-scroll btn btn-xl twf">Регистрация бесплатна</a>
             </div>
         </div>
     </div>

diff --git a/_layouts/default.html b/_layouts/default.html
@@ -5,16 +5,19 @@
   </head>
   <body id="page-top" class="index">
     {% include header.html %}
+    {% include section_info.html %}
     {% if site.is_in_progress %}
         {% include section_about.html %}
         {% if site.is_registration_open %}
             {% include section_registration.html %}
         {% else %}
             {% include section_closed_registration.html %}
         {% endif %}
-        {% include section_schedule.html %}
-        <section id="splitter"/>
-        {% include section_partners.html %}
+        {% comment %}
+            {% include section_schedule.html %} 
+            <section id="splitter"/>
+            {% include section_partners.html %}
+        {% endcomment %}
     {% else %}
         {% include section_subscribe.html %}
         <section id="splitter"/>

diff --git a/static/css/style.css b/static/css/style.css
@@ -86,6 +86,22 @@ a.events {
     margin-bottom: 10px;
 }
 
+section#info {
+    background-color: #202223;
+    background-position: center;
+    background-repeat: no-repeat;
+    color: white;
+}
+.info-block {
+    font-size: 70px;
+    font-weight: 700;
+}
+.info-underblock {
+    font-size: 30px;
+    font-weight: 400;
+}
+
+
 #nav-icon {
   width: 40px;
   height: 20px;
@@ -662,9 +678,14 @@ section#registration .form-box {
 section#registration .reg-input {
     margin-bottom: 70px;
 }
+section#registration .reg-input {
+    margin-bottom: 70px;
+    text-align: center;
+}
 @media (min-width: 768px) {
     section#registration .reg-input {
         margin-bottom: 0px;
+        text-align: center;
     }
 }
 section#registration ::-webkit-input-placeholder {