Roman

Resources/Resources.hr.resx

@@ -456,4 +456,7 @@
   <data name="LoginFailure" xml:space="preserve">
     <value>Neuspješna prijava</value>
   </data>
+  <data name="Where2StudyTeam" xml:space="preserve">
+    <value>Where 2 Study tim</value>
+  </data>
 </root>

Resources/Resources.resx

@@ -456,4 +456,7 @@
   <data name="LoginFailure" xml:space="preserve">
     <value>Login Failure</value>
   </data>
+  <data name="Where2StudyTeam" xml:space="preserve">
+    <value>Where 2 Study Team</value>
+  </data>
 </root>

Resources/obj/Debug/Resources.csproj.FileListAbsolute.txt

@@ -46,3 +46,4 @@ C:\Users\Luka\Documents\GitHub\Where2Study\Resources\obj\Debug\Resources.csproj.
 C:\Users\Luka\Documents\GitHub\Where2Study\Resources\obj\Debug\hr\Resources.resources.dll
 C:\Users\Luka\Documents\GitHub\Where2Study\Resources\obj\Debug\Resources.dll
 C:\Users\Luka\Documents\GitHub\Where2Study\Resources\obj\Debug\Resources.pdb
+D:\PROGRAMIRANJE\P9\Projekt\Probni\Where2Study\Resources\obj\Debug\Resources.csprojResolveAssemblyReference.cache

Where2Study/Controllers/AboutController.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.Mvc;
+
+namespace Where2Study.Controllers
+{
+    public class AboutController : BaseController
+    {
+        //
+        // GET: /About/
+
+        public ActionResult Index()
+        {
+            return View();
+        }
+
+    }
+}

Where2Study/Views/About/Index.cshtml

@@ -0,0 +1,36 @@
+@{
+    ViewBag.Title = "Index";
+}
+
+<h1>@Resources.Resources.Where2StudyTeam</h1>
+
+<img class="img" src="/content/Images/w2steam.jpg" alt="Where 2 Study Team" style="width:80%;height:50em">
+
+<div class="center">
+    Opisni tekst...    
+</div>
+
+<h2>Maja Popadić</h2>
+
+<img src="/content/Images/maja.jpg" alt="Maja Popadić" style="width:80%;height:20em;width:auto">
+
+<div>
+    Opisni tekst...
+</div>
+
+<h2>Luka Loina</h2>
+
+<img class="img" src="/content/Images/luka.jpg" alt="Luka Loina" style="width:80%;height:20em;width:auto">
+
+<div>
+    Opisni tekst...
+</div>
+
+<h2>Roman Lenart</h2>
+
+<img class="img" src="/content/Images/roman.jpg" alt="Roman Lenart" style="width:80%;height:20em;width:auto">
+
+<div>
+    - backend developer, poznajem MSSQL, .Net (Visual Basic, C#), Eclipse (Java), Rails (Ruby), te se lako snalazim i brzo učim nove tehnologije. Znam i dijagnosticirati bilo koji kvar na računalu, te popraviti većinu. Hobiji: internet, 
+    gaming, TCG, tenis, trčanje, filmovi, serije, reality TV...
+</div>

Where2Study/Views/Shared/_Layout.cshtml

@@ -166,7 +166,7 @@
                     <li><a href="http://www.openculture.com/freeonlinecourses">@Resources.Resources.FreeOnlCour</a></li>
                 </ul>
             </li>
-            <li><a href="/Contacts/">@Resources.Resources.Contacts</a></li>
+            @*<li><a href="/Contacts/">@Resources.Resources.Contacts</a></li>*@
 
             <li class="dropdown">
                 <a href="/Language/" data-toggle="dropdown" class="dropdown-toggle">@Resources.Resources.Language<b class="caret"></b></a>

Where2Study/Where2Study.csproj

@@ -155,6 +155,7 @@
     <Compile Include="App_Start\AuthConfig.cs" />
     <Compile Include="App_Start\BundleConfig.cs" />
     <Compile Include="BaseController.cs" />
+    <Compile Include="Controllers\AboutController.cs" />
     <Compile Include="Controllers\AccountController.cs" />
     <Compile Include="Controllers\CityController.cs" />
     <Compile Include="Controllers\ContinentController.cs" />
@@ -194,6 +195,7 @@
     <Compile Include="Models\w2sRepository.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Models\SiteLanguages.cs" />
+    <Content Include="Views\About\Index.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="App_Data\aspnet-Where2Study-20140122073505.mdf" />