Skip to content

Commit 75ff197

Browse files
committed
removed conflicts
2 parents 47e938f + 0b95c81 commit 75ff197

File tree

112 files changed

+744
-252
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+744
-252
lines changed

src/lab/Courses Aligned.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<span class="icon-bar" style="background-color: #77BB41"></span>
3939
<span class="icon-bar" style="background-color: #77BB41"></span>
4040
</button>
41+
4142
<a class="navbar-brand main-logo-a" href="http://vlab.co.in/index.html"><img class="img-responsive main-logo" src="images/logo-new.png"></a>
4243
</div>
4344

@@ -86,12 +87,14 @@
8687

8788
<!-- =================================================================================================================================== -->
8889
<div class="container-fluid" style="margin-left: 35px; margin-right: 35px;">
90+
8991
<h2 class="text-h2-lightblue" style=" margin-bottom: 20px; margin-top: 10px; "><a class="sidebar-a" href="http://vlab.co.in/computer-science-and-engineering-labs.html">Computer Science &amp; Engineering</a><br></h2>
9092

9193
<div class="row">
9294
<div class="col-md-2 sidebar-col-2">
9395
<!--edit1-->
94-
<a class="sidebar-a" href="Introduction.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">Introduction</h3></a><a class="sidebar-a" href="List of experiments.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">List of experiments</h3></a><a class="sidebar-a" href="Target Audience.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">Target Audience</h3></a><a class="sidebar-a" href="Courses Aligned.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">Courses Aligned</h3></a><!-- <a href="Prerequisites.html?domain=Computer Science" class="sidebar-a" > <h3 class="text-h3-darkblue" style="margin-top: 2px;">Prerequisites</h3></a> --><a class="sidebar-a" href="http://209.211.220.205/feedback/feedback.html"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">Feedback</h3></a> </div>
96+
<div class="col-md-2 sidebar-col-2"><a class="sidebar-a" href="Introduction.html?domain=Computer Science&amp;lab=Problem Solving Lab"> <h3 class="text-h3-darkblue" style="margin-top: 2px;"> Introduction </h3> </a><a class="sidebar-a" href="Theory.html?domain=Computer Science&amp;lab=Problem Solving Lab"> <h3 class="text-h3-darkblue" style="margin-top: 2px; color: #ff6600 !important;"> Theory </h3> </a><a class="sidebar-a" href="Objective.html?domain=Computer Science&amp;lab=Problem Solving Lab"> <h3 class="text-h3-darkblue" style="margin-top: 2px;"> Objective </h3> </a><a class="sidebar-a" href="Manual.html?domain=Computer Science&amp;lab=Problem Solving Lab"> <h3 class="text-h3-darkblue" style="margin-top: 2px;"> Manual </h3> </a><a class="sidebar-a" href="Experiment.html?domain=Computer Science&amp;lab=Problem Solving Lab"> <h3 class="text-h3-darkblue" style="margin-top: 2px;"> Experiment </h3> </a><a class="sidebar-a" href="Quiz.html?domain=Computer Science&amp;lab=Problem Solving Lab"> <h3 class="text-h3-darkblue" style="margin-top: 2px;"> Quiz </h3> </a><a class="sidebar-a" href="Feedback.html?domain=Computer Science&amp;lab=Problem Solving Lab"> <h3 class="text-h3-darkblue" style="margin-top: 2px;"> Feedback </h3> </a></div>
97+
<a class="sidebar-a" href="Introduction.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">Introduction</h3></a><a class="sidebar-a" href="List of experiments.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">List of Experiments</h3></a><a class="sidebar-a" href="Target Audience.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">Target Audience</h3></a><a class="sidebar-a" href="Courses Aligned.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px; ">Courses Aligned</h3></a><!-- <a href="Prerequisites.html?domain=Computer Science" class="sidebar-a" > <h3 class="text-h3-darkblue" style="margin-top: 2px;">Prerequisites</h3></a> --><a class="sidebar-a" href="Feedback.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">Feedback</h3></a> </div>
9598

9699
<div class="col-md-10 lab-list-col-10">
97100

@@ -208,4 +211,4 @@ <h4>Follow Us</h4>
208211
</script>
209212

210213

211-
</body><!-- jQuery --></html>
214+
</body><!-- jQuery --></html>

src/lab/Feedback.html

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<span class="icon-bar" style="background-color: #77BB41"></span>
3939
<span class="icon-bar" style="background-color: #77BB41"></span>
4040
</button>
41+
4142
<a class="navbar-brand main-logo-a" href="http://vlab.co.in/index.html"><img class="img-responsive main-logo" src="images/logo-new.png"></a>
4243
</div>
4344

@@ -86,17 +87,40 @@
8687

8788
<!-- =================================================================================================================================== -->
8889
<div class="container-fluid" style="margin-left: 35px; margin-right: 35px;">
90+
8991
<h2 class="text-h2-lightblue" style=" margin-bottom: 20px; margin-top: 10px; "><a class="sidebar-a" href="http://vlab.co.in/computer-science-and-engineering-labs.html">Computer Science &amp; Engineering</a><br></h2>
9092

9193
<div class="row">
9294
<div class="col-md-2 sidebar-col-2">
9395
<!--edit1-->
94-
<a class="sidebar-a" href="Introduction.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">Introduction</h3></a><a class="sidebar-a" href="List of experiments.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">List of experiments</h3></a><a class="sidebar-a" href="Target Audience.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">Target Audience</h3></a><a class="sidebar-a" href="Courses Aligned.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">Courses Aligned</h3></a><!-- <a href="Prerequisites.html?domain=Computer Science" class="sidebar-a" > <h3 class="text-h3-darkblue" style="margin-top: 2px;">Prerequisites</h3></a> --><a class="sidebar-a" href="http://feedback.vlabs.ac.in/"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">Feedback</h3></a> </div>
96+
<div class="col-md-2 sidebar-col-2"><a class="sidebar-a" href="Introduction.html?domain=Computer Science&amp;lab=Problem Solving Lab"> <h3 class="text-h3-darkblue" style="margin-top: 2px;"> Introduction </h3> </a><a class="sidebar-a" href="Theory.html?domain=Computer Science&amp;lab=Problem Solving Lab"> <h3 class="text-h3-darkblue" style="margin-top: 2px; color: #ff6600 !important;"> Theory </h3> </a><a class="sidebar-a" href="Objective.html?domain=Computer Science&amp;lab=Problem Solving Lab"> <h3 class="text-h3-darkblue" style="margin-top: 2px;"> Objective </h3> </a><a class="sidebar-a" href="Manual.html?domain=Computer Science&amp;lab=Problem Solving Lab"> <h3 class="text-h3-darkblue" style="margin-top: 2px;"> Manual </h3> </a><a class="sidebar-a" href="Experiment.html?domain=Computer Science&amp;lab=Problem Solving Lab"> <h3 class="text-h3-darkblue" style="margin-top: 2px;"> Experiment </h3> </a><a class="sidebar-a" href="Quiz.html?domain=Computer Science&amp;lab=Problem Solving Lab"> <h3 class="text-h3-darkblue" style="margin-top: 2px;"> Quiz </h3> </a><a class="sidebar-a" href="Feedback.html?domain=Computer Science&amp;lab=Problem Solving Lab"> <h3 class="text-h3-darkblue" style="margin-top: 2px;"> Feedback </h3> </a></div>
97+
<a class="sidebar-a" href="Introduction.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">Introduction</h3></a><a class="sidebar-a" href="List of experiments.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">List of Experiments</h3></a><a class="sidebar-a" href="Target Audience.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">Target Audience</h3></a><a class="sidebar-a" href="Courses Aligned.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">Courses Aligned</h3></a><!-- <a href="Prerequisites.html?domain=Computer Science" class="sidebar-a" > <h3 class="text-h3-darkblue" style="margin-top: 2px;">Prerequisites</h3></a> --><a class="sidebar-a" href="Feedback.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px; ">Feedback</h3></a> </div>
9598

9699
<div class="col-md-10 lab-list-col-10">
97100

98101
<!--edit -->
99-
<h1 class="text-h2-lightblue">Problem Solving Lab</h1><a href="http://feedback.vlabs.ac.in/">Feedback</a> </div>
102+
<h1 class="text-h2-lightblue">Problem Solving Lab</h1>
103+
104+
105+
<p><b>Dear User</b>,</p>
106+
107+
<p>
108+
Thanks for using Virtual Labs. Your opinion is valuable to us. To help us improve, we'd like to ask you a few questions about your experience. It will only take 3 minutes and your answers will help us make Virtual Labs better for you and other users.
109+
</p>
110+
<br/>
111+
112+
<a href="http://209.211.220.205/feedback/feedback.html" id="feedback-btn-link">
113+
<button class="btn btn-default btn-lg" id="feedback-btn" type="button">Share Your Experience</button>
114+
</a>
115+
<br/>
116+
<br/>
117+
118+
<p>
119+
Thanks for your time !
120+
<br/>
121+
<b>The Virtual Labs Team</b>
122+
</p>
123+
</div>
100124
</div>
101125
</div>
102126
<!-- =================================================================================================================================== -->
@@ -207,4 +231,4 @@ <h4>Follow Us</h4>
207231

208232

209233

210-
</body><!-- jQuery --></html>
234+
</body><!-- jQuery --></html>

src/lab/Introduction.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<span class="icon-bar" style="background-color: #77BB41"></span>
3939
<span class="icon-bar" style="background-color: #77BB41"></span>
4040
</button>
41+
4142
<a class="navbar-brand main-logo-a" href="http://vlab.co.in/index.html"><img class="img-responsive main-logo" src="images/logo-new.png"></a>
4243
</div>
4344

@@ -86,12 +87,14 @@
8687

8788
<!-- =================================================================================================================================== -->
8889
<div class="container-fluid" style="margin-left: 35px; margin-right: 35px;">
90+
8991
<h2 class="text-h2-lightblue" style=" margin-bottom: 20px; margin-top: 10px; "><a class="sidebar-a" href="http://vlab.co.in/computer-science-and-engineering-labs.html">Computer Science &amp; Engineering</a><br></h2>
9092

9193
<div class="row">
9294
<div class="col-md-2 sidebar-col-2">
9395
<!--edit1-->
94-
<a class="sidebar-a" href="Introduction.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">Introduction</h3></a><a class="sidebar-a" href="List of experiments.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">List of experiments</h3></a><a class="sidebar-a" href="Target Audience.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">Target Audience</h3></a><a class="sidebar-a" href="Courses Aligned.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">Courses Aligned</h3></a><!-- <a href="Prerequisites.html?domain=Computer Science" class="sidebar-a" > <h3 class="text-h3-darkblue" style="margin-top: 2px;">Prerequisites</h3></a> --><a class="sidebar-a" href="http://209.211.220.205/feedback/feedback.html"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">Feedback</h3></a> </div>
96+
<div class="col-md-2 sidebar-col-2"><a class="sidebar-a" href="Introduction.html?domain=Computer Science&amp;lab=Problem Solving Lab"> <h3 class="text-h3-darkblue" style="margin-top: 2px;"> Introduction </h3> </a><a class="sidebar-a" href="Theory.html?domain=Computer Science&amp;lab=Problem Solving Lab"> <h3 class="text-h3-darkblue" style="margin-top: 2px; color: #ff6600 !important;"> Theory </h3> </a><a class="sidebar-a" href="Objective.html?domain=Computer Science&amp;lab=Problem Solving Lab"> <h3 class="text-h3-darkblue" style="margin-top: 2px;"> Objective </h3> </a><a class="sidebar-a" href="Manual.html?domain=Computer Science&amp;lab=Problem Solving Lab"> <h3 class="text-h3-darkblue" style="margin-top: 2px;"> Manual </h3> </a><a class="sidebar-a" href="Experiment.html?domain=Computer Science&amp;lab=Problem Solving Lab"> <h3 class="text-h3-darkblue" style="margin-top: 2px;"> Experiment </h3> </a><a class="sidebar-a" href="Quiz.html?domain=Computer Science&amp;lab=Problem Solving Lab"> <h3 class="text-h3-darkblue" style="margin-top: 2px;"> Quiz </h3> </a><a class="sidebar-a" href="Feedback.html?domain=Computer Science&amp;lab=Problem Solving Lab"> <h3 class="text-h3-darkblue" style="margin-top: 2px;"> Feedback </h3> </a></div>
97+
<a class="sidebar-a" href="Introduction.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px; ">Introduction</h3></a><a class="sidebar-a" href="List of experiments.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">List of Experiments</h3></a><a class="sidebar-a" href="Target Audience.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">Target Audience</h3></a><a class="sidebar-a" href="Courses Aligned.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">Courses Aligned</h3></a><!-- <a href="Prerequisites.html?domain=Computer Science" class="sidebar-a" > <h3 class="text-h3-darkblue" style="margin-top: 2px;">Prerequisites</h3></a> --><a class="sidebar-a" href="Feedback.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">Feedback</h3></a> </div>
9598

9699
<div class="col-md-10 lab-list-col-10">
97100

@@ -213,4 +216,4 @@ <h4>Follow Us</h4>
213216

214217

215218

216-
</body><!-- jQuery --></html>
219+
</body><!-- jQuery --></html>

src/lab/List of experiments.html

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<span class="icon-bar" style="background-color: #77BB41"></span>
3939
<span class="icon-bar" style="background-color: #77BB41"></span>
4040
</button>
41+
4142
<a class="navbar-brand main-logo-a" href="http://vlab.co.in/index.html"><img class="img-responsive main-logo" src="images/logo-new.png"></a>
4243
</div>
4344

@@ -86,19 +87,22 @@
8687

8788
<!-- =================================================================================================================================== -->
8889
<div class="container-fluid" style="margin-left: 35px; margin-right: 35px;">
90+
8991
<h2 class="text-h2-lightblue" style=" margin-bottom: 20px; margin-top: 10px; "><a class="sidebar-a" href="http://vlab.co.in/computer-science-and-engineering-labs.html">Computer Science &amp; Engineering</a><br></h2>
9092

9193
<div class="row">
9294
<div class="col-md-2 sidebar-col-2">
9395
<!--edit1-->
94-
<a class="sidebar-a" href="Introduction.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">Introduction</h3></a><a class="sidebar-a" href="List of experiments.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">List of experiments</h3></a><a class="sidebar-a" href="Target Audience.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">Target Audience</h3></a><a class="sidebar-a" href="Courses Aligned.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">Courses Aligned</h3></a><!-- <a href="Prerequisites.html?domain=Computer Science" class="sidebar-a" > <h3 class="text-h3-darkblue" style="margin-top: 2px;">Prerequisites</h3></a> --><a class="sidebar-a" href="http://209.211.220.205/feedback/feedback.html"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">Feedback</h3></a> </div>
96+
<div class="col-md-2 sidebar-col-2"><a class="sidebar-a" href="Introduction.html?domain=Computer Science&amp;lab=Problem Solving Lab"> <h3 class="text-h3-darkblue" style="margin-top: 2px;"> Introduction </h3> </a><a class="sidebar-a" href="Theory.html?domain=Computer Science&amp;lab=Problem Solving Lab"> <h3 class="text-h3-darkblue" style="margin-top: 2px; color: #ff6600 !important;"> Theory </h3> </a><a class="sidebar-a" href="Objective.html?domain=Computer Science&amp;lab=Problem Solving Lab"> <h3 class="text-h3-darkblue" style="margin-top: 2px;"> Objective </h3> </a><a class="sidebar-a" href="Manual.html?domain=Computer Science&amp;lab=Problem Solving Lab"> <h3 class="text-h3-darkblue" style="margin-top: 2px;"> Manual </h3> </a><a class="sidebar-a" href="Experiment.html?domain=Computer Science&amp;lab=Problem Solving Lab"> <h3 class="text-h3-darkblue" style="margin-top: 2px;"> Experiment </h3> </a><a class="sidebar-a" href="Quiz.html?domain=Computer Science&amp;lab=Problem Solving Lab"> <h3 class="text-h3-darkblue" style="margin-top: 2px;"> Quiz </h3> </a><a class="sidebar-a" href="Feedback.html?domain=Computer Science&amp;lab=Problem Solving Lab"> <h3 class="text-h3-darkblue" style="margin-top: 2px;"> Feedback </h3> </a></div>
97+
<a class="sidebar-a" href="Introduction.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">Introduction</h3></a><a class="sidebar-a" href="List of experiments.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px; ">List of Experiments</h3></a><a class="sidebar-a" href="Target Audience.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">Target Audience</h3></a><a class="sidebar-a" href="Courses Aligned.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">Courses Aligned</h3></a><!-- <a href="Prerequisites.html?domain=Computer Science" class="sidebar-a" > <h3 class="text-h3-darkblue" style="margin-top: 2px;">Prerequisites</h3></a> --><a class="sidebar-a" href="Feedback.html?domain=Computer Science"> <h3 class="text-h3-darkblue" style="margin-top: 2px;">Feedback</h3></a> </div>
9598

9699
<div class="col-md-10 lab-list-col-10">
97100

98101
<!--edit -->
99102
<h1 class="text-h2-lightblue">Problem Solving Lab</h1><div>
100-
<br>
101-
<ul id="list-of-experiments">
103+
<br/>
104+
<ol id="list-of-experiments">
105+
102106
<li>
103107
<!--Link and name of the experiment 1 -->
104108
<a href="exp1/Introduction.html?domain=Computer Science&amp;lab=Problem Solving Lab">Numerical Representation</a>
@@ -139,7 +143,7 @@ <h1 class="text-h2-lightblue">Problem Solving Lab</h1><div>
139143
<!--Link and name of the experiment 1 -->
140144
<a href="exp10/Introduction.html?domain=Computer Science&amp;lab=Problem Solving Lab">Sequences</a>
141145
</li>
142-
</ul>
146+
</ol>
143147
</div> </div>
144148
</div>
145149
</div>
@@ -251,4 +255,4 @@ <h4>Follow Us</h4>
251255

252256

253257

254-
</body><!-- jQuery --></html>
258+
</body><!-- jQuery --></html>

0 commit comments

Comments
 (0)