Commit 10e24701809c914a23b2263f3ad29b3fcbd3752a

Authored by root
Exists in master and in 1 other branch paytm

fixed conflicts

... ... @@ -1040,7 +1040,7 @@ input.hidden {
1040 1040 height: 44px;
1041 1041 color: #fff;
1042 1042 background-color: #666;
1043   - width: 100px;
  1043 + width: 75px;
1044 1044 }
1045 1045 .coupen-approved{
1046 1046 position: absolute;
... ...
... ... @@ -32,21 +32,24 @@
32 32 -->
33 33 <ol style="margin-bottom: 0;font-size:15px"><li style="font-weight: bold;"><b>Live Pitch Details</b></li></ol>
34 34 <ul>
35   - <li>Select a city meetup near you to pitch. <b>No PowerPoints</b> mandatory. Come and speak about your idea/Startup in 3 minutes.</li>
36   - <li>If you are selected - we will pay for <b>one-way flight</b> to the final pitching in Chandigarh.</li>
37   - <li>Pitch live in front of india’s biggest entrepreneurs and get on the spot funding!</li>
  35 + <li>Select a city meetup near you to pitch your idea/Startup- without PowerPoints in just 3 minutes.</li>
  36 + <li>10 startups from each city will be given sponsored travel to Chandigarh for final pitching.</li>
  37 + <li>Pitch in front of biggest investors and get on the spot funding.</li>
38 38 </ul>
  39 + <p>There are over 30+ investors participating in Jalsa 2017, you will also get to personally interact 1-on-1 with investors.</p>
39 40 <ol start="2" style="margin-bottom: 0;padding-top:1%;font-size:15px"><li style="font-weight:bold;"><b>Guaranteed funding details:</b></li></ol>
40 41 <ul>
41   - <li>1 idea stage startup will get guaranteed <b>₹10 Lac</b> funding from Startup Jalsa.**</li>
42   - <li>1 product stage startup will get guaranteed <b>₹1 Crore</b> funding from Startup Jalsa.**</li>
  42 + <li>1 idea stage startup will get guaranteed <b>₹10 Lac</b> funding.*</li>
  43 + <li>1 product stage startup will get guaranteed <b>₹1 Crore</b> funding.*</li>
43 44 </ul>
  45 + <p>* funding Subject to due diligence</p>
44 46 </div>
45 47 </div>
46 48 <div class="row">
47 49 <div class="col-sm-4">
48 50 <div class="card" style="width:auto;">
49 51 <p style="font-size:15px;padding:5% 4%"><b>Inspire edition of Startup Jalsa is coming to the following cities:</b></p>
  52 + <span style="padding:0% 4%">Pitch on the following dates: 3:30PM onward.</span>
50 53 <ul>
51 54 <li>November 9: Chennai</li>
52 55 <li>November 11: Pune</li>
... ...
pages/registration.html
... ... @@ -96,7 +96,7 @@
96 96 <button class="btn btn-info float-right btn-sm button-aligment" style="float:right;padding:3px 9px;" ng-click="register('ahmedabad')">Apply</button>
97 97 </div>
98 98 <div class="clearfix"></div>
99   - <label class="card-sub-title"><span style="color:red"> Early bird deadline</span> : <span id="ahmedabad"></span>*</label>
  99 + <label class="card-sub-title"><span style="color:red"> Post deadline expires in</span> : <span id="ahmedabad"></span>*</label>
100 100 </div>
101 101 <div class="card-text2">
102 102 <span><b>Location</b></span>
... ... @@ -284,9 +284,7 @@
284 284 <div class="clearfix"></div>
285 285 <div class="cards-content hidden-xs">
286 286 <p>
287   - &#x26AC; <span style="font-weight:bold">Have an idea and need execution help?</span><br>
288   - &#x26AC; Get feedback from mentors<br>
289   - &#x26AC; Validate your idea.
  287 + &#x26AC; <span style="font-weight:bold">One idea will get a chance to pitch and 10lac guaranteed funding* T&C</span><br>
290 288 </p>
291 289 </div>
292 290 </div>
... ... @@ -296,16 +294,14 @@
296 294 <label style="cursor:pointer" class="thumbnail radius-border stage-thumbnail" for="Proof">
297 295 <img class="stage-img stage-product" src="images/production-stage.png" alt="Lights">
298 296 <div class="card-content f-family">
299   - <p align="center"><b style="font-size:14px">Pitch your Product</b></p>
  297 + <p align="center"><b style="font-size:14px">Pitch your Startup</b></p>
300 298 </div>
301 299 </label>
302 300 </div>
303 301 <div class="clearfix"></div>
304 302 <div class="cards-content hidden-xs">
305 303 <p>
306   - &#x26AC; <span style="font-weight:bold">Have a prototype and want to take it to next level?</span><br>
307   - &#x26AC; Advice on fundraising<br>
308   - &#x26AC; Advice on go-to-market strategy
  304 + &#x26AC; <span style="font-weight:bold">The top startup will get Rs 1crore prize in form of funding* T&C</span><br>
309 305 </p>
310 306 </div>
311 307 </div>
... ... @@ -355,25 +351,21 @@
355 351 <div class="hidden-sm hidden-md hidden-lg">
356 352 <div class="cards-content" ng-if="data.stage == 'Idea'">
357 353 <p>
358   - &#x26AC; <span style="font-weight:bold">Have an idea and need execution help?</span><br>
359   - &#x26AC; Get feedback from mentors<br>
360   - &#x26AC; Validate your idea.
  354 + &#x26AC; <span style="font-weight:bold">One idea will get a chance to pitch and 10lac guaranteed funding* T&C</span><br>
361 355 </p>
362 356 </div>
363 357 <div class="cards-content" ng-if="data.stage == 'Product'">
364 358 <p>
365   - &#x26AC; <span style="font-weight:bold">Have a prototype and want to take it to next level?</span><br>
366   - &#x26AC; Advice on fundraising<br>
367   - &#x26AC; Advice on go-to-market strategy
  359 + &#x26AC; <span style="font-weight:bold">The top startup will get Rs 1crore prize in form of funding* T&C</span><br>
368 360 </p>
369 361 </div>
370   - <div class="cards-content" ng-if="data.stage == 'Growth'">
  362 + <!-- <div class="cards-content" ng-if="data.stage == 'Growth'">
371 363 <p>
372 364 &#x26AC; <span style="font-weight:bold">Have traction and looking to scale up?</span><br>
373 365 &#x26AC; Connect with Series A investors<br>
374 366 &#x26AC; Connect and hire top startups
375 367 </p>
376   - </div>
  368 + </div> -->
377 369 <!-- <div class="cards-content" ng-if="data.stage == 'Visitor'">
378 370 <p>
379 371 &#x26AC; <span style="font-weight:bold">Have an idea and need execution help?</span><br>
... ... @@ -549,7 +541,7 @@
549 541 <div class="icon-circle-e">
550 542 <i class="material-icons" style="line-height: 30px;">phone</i>
551 543 </div>
552   - <input type="text" ng-pattern="/^[0-9+-]*$/" maxlength="15" class="text-input" ng-blur="numbercheck(data.number)" ng-model="data.number" placeholder="Mobile No.*" ng-focus="removeNoError()" ng-change="enternumber(data.number); phonekeyPress(data.number)">
  544 + <input type="text" ng-pattern="/^[0-9+-]*$/" maxlength="15" class="text-input" ng-model="data.number" placeholder="Mobile No.*" ng-focus="removeNoError()" ng-change="enternumber(data.number); phonekeyPress(data.number)">
553 545 <label ng-if="numberCheck">Contact Number already exist.</label>
554 546 </div>
555 547 <div class="col-xs-12 col-md-12 input-wrapper">
... ... @@ -733,12 +725,12 @@
733 725 <input class="text-input" ng-model="data.referalToken" maxlength="6" minlength="6" placeholder="Enter Promo code" style="position: relative;" ng-required="referalToken" ng-change="changeReferalIconColor(data.referalToken)">
734 726 <i class="material-icons coupen-approved" ng-if="tokencheck == true">check</i>
735 727 <i class="material-icons coupen-approved" style="color:red;" ng-if="tokencheck == false">close</i>
736   - <button type="button" ng-click="tokenCall(data.referalToken)" class="pull-right apply-coupen-btn">Apply</button>
  728 + <button type="button" ng-click="tokenCall(data.referalToken)" class="pull-right apply-coupen-btn">Apply Promo</button>
737 729 </div>
738 730 <span style="padding-left:10px">* One ticket is valid for one person.</span>
739 731 <div class="clearfix"></div>
740 732 <div class="text-center">
741   - <input type="submit" class="btn submit-button" ng-disabled="applicantForm.$invalid|| check|| numberCheck" value="Submit" ng-click="calculateAmount()">
  733 + <input type="submit" style="width:200px" class="btn submit-button" ng-disabled="applicantForm.$invalid|| check|| numberCheck" value="Submit" ng-click="calculateAmount()">
742 734 </div>
743 735  
744 736 </div>
... ...
... ... @@ -108,7 +108,7 @@
108 108 }
109 109 }, 1000);
110 110  
111   - var mumbai = new Date("Nov 13, 2017 12:00:00").getTime();
  111 + var mumbai = new Date("Nov 13, 2017 16:00:00").getTime();
112 112 // Update the count down every 1 second
113 113 var x = setInterval(function() {
114 114 // Get todays date and time
... ... @@ -132,7 +132,7 @@
132 132 }
133 133 }, 1000);
134 134  
135   - var ahmedabad = new Date("Nov 13, 2017 12:00:00").getTime();
  135 + var ahmedabad = new Date("Nov 15, 2017 12:00:00").getTime();
136 136 // Update the count down every 1 second
137 137 var x = setInterval(function() {
138 138 // Get todays date and time
... ... @@ -651,7 +651,7 @@
651 651  
652 652 }, function myError(error) {});
653 653 }
654   - }, function myError(error) {});
  654 + }, function myError(error) {alert(error)});
655 655 }
656 656  
657 657 }
... ...