Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: ygoldfrid/CrossFit
base: 529562aab2
...
head fork: ygoldfrid/CrossFit
compare: c93611fc34
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 8 files changed
  • 0 commit comments
  • 1 contributor
Commits on Jun 03, 2012
@smotles smotles casi listo 86f6061
@smotles smotles casi c93611f
View
BIN  CrossFit/Content/images/167181_10150177911299546_515639545_8732719_4845813_n.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  CrossFit/Content/images/Koala (1).png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  CrossFit/Content/images/straw.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  CrossFit/Content/images/training.jpg
Deleted file not rendered
View
11 CrossFit/Controllers/HomeController.cs
@@ -19,8 +19,12 @@ public ActionResult Index()
{
CurrentUser();
- ViewBag.Message = "Bienvenido al sitio de Fashion CrossFit";
-
+ ViewBag.Message = "Bienvenido al sitio de Fashion CrossFit";
+
+ //var images = new ImagesModel();
+ //var files = Directory.GetFiles(Server.MapPath("~/Content/images"));
+ //images.Images = files.ToString();
+ //return View(images);
return View();
}
@@ -52,7 +56,8 @@ public ActionResult UploadImage(UploadImageModel model)
var img = CreateImage(original, model.X, model.Y, model.Width, model.Height);
//Demo purposes only - save image in the file system
- var fn = Server.MapPath("~/Content/img/" + name + ".png");
+ //var fn = Server.MapPath("~/Content/images/" + name + ".png");
+ var fn = Server.MapPath("~/Content/images/training.jpg");
img.Save(fn, System.Drawing.Imaging.ImageFormat.Png);
//using (MemoryStream stream = new MemoryStream())
View
1  CrossFit/CrossFit.csproj
@@ -77,6 +77,7 @@
</Compile>
<Compile Include="Models\CrossFitContext.cs" />
<Compile Include="Models\CrossFitInitializer.cs" />
+ <Compile Include="Models\ImagesModel.cs" />
<Compile Include="Models\UploadImageModel.cs" />
<Compile Include="Models\Usuario.cs" />
<Compile Include="Models\Ejercicio.cs" />
View
12 CrossFit/Models/ImagesModel.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace CrossFit.Models
+{
+ public class ImagesModel
+ {
+ public String Images { get; set; }
+ }
+}
View
2  CrossFit/Views/Home/Index.cshtml
@@ -5,7 +5,7 @@
<h2>@ViewBag.Message</h2>
<p>
-
+ @*<a href="@Url.Content("~/Content/images/training.jpg")" target="_blank"><img src="@Url.Content("~/Content/images/training.jpg")" alt="Image" class="imagePreview" /></a>*@
<img src="Content/images/training.jpg" height="150" width="100" border="0" />
Bienvenido a Fashion CrossFit, un sitio donde podrás encontrar las mejores herramientas para tus entrenamientos,
subir tus propios ejercicios y aprender de usuarios experimentados (y los no tan experimentados).

No commit comments for this range

Something went wrong with that request. Please try again.