Shilpi Saini / startup_jalsa_frontend

Download as
Browse Code »

Commit 8e38c5b712c15267a1aae7b6b0c0a0043902014b

Authored by Palak Handa
1 parent a987358e89
Exists in master and in 1 other branch paytm

integrate timer

Showing 4 changed files with 59 additions and 24 deletions   Show diff stats
... ... @@ -71,4 +71,16 @@
71 71 <img id="footer" class="img-responsive banner">
72 72 <center class="footer"><a class="footer-link" href="http://www.viithiisys.com/" target="_blank"></a> </center>
73 73 </footer>
  74 +<span ng-show="span == true">
  75 + <span id="chennai"></span>
  76 + <span id="mumbai"></span>
  77 + <span id="hyderabad"></span>
  78 + <span id="kolkata"></span>
  79 + <span id="delhi"></span>
  80 + <span id="ahmedabad"></span>
  81 + <span id="bengaluru"></span>
  82 + <span id="jaipur"></span>kanpur
  83 + <span id="kanpur"></span>
  84 + <span id="dharamsala"></span>
  85 +</span>
74 86  
... ...
pages/ambassador.html
Diff comments   View file @8e38c5b
... ... @@ -84,4 +84,4 @@
84 84 </div>
85 85 </div>
86 86 </div>
87   -</div>
88 87 \ No newline at end of file
  88 +</div>
... ...
pages/caricatures.html
Diff comments   View file @8e38c5b
... ... @@ -13,7 +13,8 @@
13 13 </div>
14 14 <div class="pull-right">
15 15 <label class="card-sub-title"><i class="material-icons">location_on</i>
16   - <span style="position: relative;top: -3px;font-size: 17px;">IIT-Madras</span>
  16 + <span style="position: relative;top: -3px;font-size: 17px;">IIT-Madras</span><br>
  17 + <span id="chennai" style="color:red;"></span>*
17 18 </label>
18 19 </div>
19 20 <div class="clearfix"></div>
... ... @@ -38,7 +39,8 @@
38 39 </div>
39 40 <div class="pull-right">
40 41 <label class="card-sub-title"><i class="material-icons">location_on</i>
41   - <span style="position: relative;top: -3px;font-size: 17px;">IIT-Hyderabad</span>
  42 + <span style="position: relative;top: -3px;font-size: 17px;">IIT-Hyderabad</span><br>
  43 + <span id="hyderabad" style="color:red;padding-left: 23%;"></span>*
42 44 </label>
43 45 </div>
44 46 <div class="clearfix"></div>
... ... @@ -63,7 +65,8 @@
63 65 </div>
64 66 <div class="pull-right">
65 67 <label class="card-sub-title"><i class="material-icons">location_on</i>
66   - <span style="position: relative;top: -3px;font-size: 17px;">IIT-Bombay</span>
  68 + <span style="position: relative;top: -3px;font-size: 17px;">IIT-Bombay</span><br>
  69 + <span id="mumbai" style="color:red;"></span>*
67 70 </label>
68 71 </div>
69 72 <div class="clearfix"></div>
... ... @@ -88,7 +91,8 @@
88 91 </div>
89 92 <div class="pull-right">
90 93 <label class="card-sub-title"><i class="material-icons">location_on</i>
91   - <span style="position: relative;top: -3px;font-size: 17px;">IIM-Calcutta</span>
  94 + <span style="position: relative;top: -3px;font-size: 17px;">IIM-Calcutta</span><br>
  95 + <span id="kolkata" style="color:red;"></span>*
92 96 </label>
93 97 </div>
94 98 <div class="clearfix"></div>
... ... @@ -118,7 +122,8 @@
118 122 </div>
119 123 <div class="pull-right">
120 124 <label class="card-sub-title"><i class="material-icons">location_on</i>
121   - <span style="position: relative;top: -3px;font-size: 17px;">Startup Oasis</span>
  125 + <span style="position: relative;top: -3px;font-size: 17px;">Startup Oasis</span><br>
  126 + <span id="jaipur" style="color:red;padding-left: 17%;"></span>*
122 127 </label>
123 128 </div>
124 129 <div class="clearfix"></div>
... ... @@ -143,7 +148,8 @@
143 148 </div>
144 149 <div class="pull-right">
145 150 <label class="card-sub-title"><i class="material-icons">location_on</i>
146   - <span style="position: relative;top: -3px;font-size: 17px;">IIT-Delhi</span>
  151 + <span style="position: relative;top: -3px;font-size: 17px;">IIT-Delhi</span><br>
  152 + <span id="delhi" style="color:red;"></span>*
147 153 </label>
148 154 </div>
149 155 <div class="clearfix"></div>
... ... @@ -168,7 +174,8 @@
168 174 </div>
169 175 <div class="pull-right">
170 176 <label class="card-sub-title"><i class="material-icons">location_on</i>
171   - <span style="position: relative;top: -3px;font-size: 17px;">IIT-Kanpur</span>
  177 + <span style="position: relative;top: -3px;font-size: 17px;">IIT-Kanpur</span><br>
  178 + <span id="kanpur" style="color:red;"></span>*
172 179 </label>
173 180 </div>
174 181 <div class="clearfix"></div>
... ... @@ -193,7 +200,8 @@
193 200 </div>
194 201 <div class="pull-right">
195 202 <label class="card-sub-title"><i class="material-icons">location_on</i>
196   - <span style="position: relative;top: -3px;font-size: 17px;">IIM-Ahmedabad</span>
  203 + <span style="position: relative;top: -3px;font-size: 17px;">IIM-Ahmedabad</span><br>
  204 + <span id="ahmedabad" style="color:red;padding-left: 18%;"></span>*
197 205 </label>
198 206 </div>
199 207 <div class="clearfix"></div>
... ... @@ -221,11 +229,12 @@
221 229 <label class="card-title">Bengaluru</label><br>
222 230 <label class="card-sub-title">Saturday</label>
223 231 </div>
224   - <!-- <div class="pull-right">
  232 + <div class="pull-right">
225 233 <label class="card-sub-title"><i class="material-icons">location_on</i>
226   - <span style="position: relative;top: -3px;font-size: 17px;">bangalore</span>
  234 + <span style="position: relative;top: -3px;font-size: 17px;">bangalore</span><br>
  235 + <span id="bengaluru" style="color:red;"></span>*
227 236 </label>
228   - </div> -->
  237 + </div>
229 238 <div class="clearfix"></div>
230 239 <label class="card-sub-title">Oct 13, 2018</label>
231 240 </div>
... ... @@ -250,6 +259,7 @@
250 259 <div class="pull-right">
251 260 <label class="card-sub-title"><i class="material-icons">location_on</i>
252 261 <span style="position: relative;top: -3px;font-size: 17px;">The Pavilion</span>
  262 + <!-- <span id="dharamsala" style="color:red;"></span>* -->
253 263 </label>
254 264 </div>
255 265 <div class="clearfix"></div>
... ... @@ -303,11 +313,24 @@
303 313 </div>
304 314 <div class="clearfix"></div>
305 315 </div>
  316 + <div style="margin-top:3%;">“* Registeration closes”</div>
306 317 </div>
307 318 <div class="clearfix"></div>
308 319 <footer style="margin-top: 5%;">
309 320 <img id="footer" class="img-responsive banner">
310 321 <center class="footer"><a class="footer-link" href="http://www.viithiisys.com/" target="_blank">Viithiisys Technologies.</a> </center>
311 322 </footer>
  323 +<span ng-show="span == true">
  324 + <span id="chennai"></span>
  325 + <span id="mumbai"></span>
  326 + <span id="hyderabad"></span>
  327 + <span id="kolkata"></span>
  328 + <span id="delhi"></span>
  329 + <span id="ahmedabad"></span>
  330 + <span id="bengaluru"></span>
  331 + <span id="jaipur"></span>kanpur
  332 + <span id="kanpur"></span>
  333 + <span id="dharamsala"></span>
  334 +</span>
312 335  
313 336  
... ...
... ... @@ -65,7 +65,7 @@
65 65 hide: false
66 66 };
67 67  
68   - var chennai = new Date("Sept 20, 2018 12:00:00").getTime();
  68 + var chennai = new Date("Sept 18, 2018 12:00:00").getTime();
69 69 // Update the count down every 1 second
70 70 var x = setInterval(function() {
71 71 // Get todays date and time
... ... @@ -89,7 +89,7 @@
89 89 }
90 90 }, 1000);
91 91  
92   - var hyderabad = new Date("Sept 22, 2018 12:00:00").getTime();
  92 + var hyderabad = new Date("Sept 20, 2018 12:00:00").getTime();
93 93 // Update the count down every 1 second
94 94 var x = setInterval(function() {
95 95 // Get todays date and time
... ... @@ -113,7 +113,7 @@
113 113 }
114 114 }, 1000);
115 115  
116   - var mumbai = new Date("Sept 26, 2018 12:00:00").getTime();
  116 + var mumbai = new Date("Sept 24, 2018 12:00:00").getTime();
117 117 // Update the count down every 1 second
118 118 var x = setInterval(function() {
119 119 // Get todays date and time
... ... @@ -137,7 +137,7 @@
137 137 }
138 138 }, 1000);
139 139  
140   - var kolkata = new Date("Oct 3, 2018 12:00:00").getTime();
  140 + var kolkata = new Date("Oct 1, 2018 12:00:00").getTime();
141 141 // Update the count down every 1 second
142 142 var x = setInterval(function() {
143 143 // Get todays date and time
... ... @@ -161,7 +161,7 @@
161 161 }
162 162 }, 1000);
163 163  
164   - var jaipur = new Date("Oct 5, 2018 12:00:00").getTime();
  164 + var jaipur = new Date("Oct 3, 2018 12:00:00").getTime();
165 165 // Update the count down every 1 second
166 166 var x = setInterval(function() {
167 167 // Get todays date and time
... ... @@ -185,7 +185,7 @@
185 185 }
186 186 }, 1000);
187 187  
188   - var delhi = new Date("Oct 8, 2018 12:00:00").getTime();
  188 + var delhi = new Date("Oct 6, 2018 12:00:00").getTime();
189 189 // Update the count down every 1 second
190 190 var x = setInterval(function() {
191 191 // Get todays date and time
... ... @@ -209,7 +209,7 @@
209 209 }
210 210 }, 1000);
211 211  
212   - var kanpur = new Date("Oct 10, 2018 12:00:00").getTime();
  212 + var kanpur = new Date("Oct 8, 2018 12:00:00").getTime();
213 213 // Update the count down every 1 second
214 214 var x = setInterval(function() {
215 215 // Get todays date and time
... ... @@ -233,7 +233,7 @@
233 233 }
234 234 }, 1000);
235 235  
236   - var ahmedabad = new Date("Oct 12, 2018 12:00:00").getTime();
  236 + var ahmedabad = new Date("Oct 10, 2018 12:00:00").getTime();
237 237 // Update the count down every 1 second
238 238 var x = setInterval(function() {
239 239 // Get todays date and time
... ... @@ -257,7 +257,7 @@
257 257 }
258 258 }, 1000);
259 259  
260   - var bengaluru = new Date("Oct 13, 2018 12:00:00").getTime();
  260 + var bengaluru = new Date("Oct 11, 2018 12:00:00").getTime();
261 261 // Update the count down every 1 second
262 262 var x = setInterval(function() {
263 263 // Get todays date and time
... ... @@ -281,7 +281,7 @@
281 281 }
282 282 }, 1000);
283 283  
284   - var dharamsala = new Date("Dec 14, 2018 12:00:00").getTime();
  284 + var dharamsala = new Date("Dec 12, 2018 12:00:00").getTime();
285 285 // Update the count down every 1 second
286 286 var x = setInterval(function() {
287 287 // Get todays date and time
... ... @@ -644,8 +644,8 @@
644 644 console.log("====$scope.discountpercentage====",$scope.discountpercentage);
645 645 console.log("resultcity===",$scope.data.city)
646 646 if($scope.discountpercentage == "100") {
647   - $scope.discountpercentage = "99.8";
648   - console.log("$scope.discountpercentage====",$scope.discountpercentage)
  647 + $scope.discountpercentage = "99.8";
  648 + console.log("$scope.discountpercentage====",$scope.discountpercentage)
649 649 }
650 650 console.log("====$scope.discountpercentage====",$scope.discountpercentage);
651 651 $scope.percDiscount = $scope.discountpercentage/100;
... ...