Upgrade to MVC5, new themes, refresh all packages

[andrasfuchs]

New features in 2.5 (2015-03-30)

• Upgraded the project file to work with Visual Studio 2013 Community Editon
• The HTML structure of the site mirrors the default WordPress structure, so we can apply WordPress themes to FunnelWeb now
• Theming engine now supports both WordPress and Bootstrap themes
• Updated the MVC framework to version 5
• Included Bootstrap 3 and it's responsive layout (so it's mobile-friendly now)
• Redesigned the administration page
• ShowDown and WMD is replaced by a more recent PageDown
• The HTML is more HTML5-compliant
• Tested with both SQL and SQL CE databases

Screenshots

Admin

WP-Flower theme

WP-Hostmarks theme

WP-Quark theme

WP-Topmag theme

Further Information

If you need some help with .NET, C#, MVC, Entity Framework, HTML5, CSS, JavaScript, jQuery or Bootstrap, you can contact me for one-on-one consultancy or live training on the Kevin Sharp Traning website.

[JakeGinnivan]

0_o

I think I should just add you and @noopman as colaborators of funnelweb?

[JakeGinnivan]

Not that this isn't welcome, I am just not using FunnelWeb at the moment and you guys will likely do it justice helping maintain it?

[janierdavila]

@andrasfuchs This is major! I see you have been busy! I will get these changes and see if I can integrate them with my blog branch to test it out.

[andrasfuchs]

Thanks!

@JakeGinnivan Jake, sure, you can add me to the collaborators. This version needs to be tested and fixed here and there, but I hope others can join us!

@janierdavila Obviously I've made some breaking changes too, so please be careful with it :) I know that a few things are not working well, like the tagging control, sometimes I've got an NHibernate error while saving the settings etc., and I didn't have the time to test all the features (like Azure authentication).

On the other hand, I would be glad to get the some feedback or even fixes ;)

[JakeGinnivan]

@andrasfuchs you have push access. You could push this to a branch in the main repo and get others to help out while it is stabilised

[andrasfuchs]

@JakeGinnivan Great, thank you! I probably missed something, but I was unable to create a new branch in FunnelWeb. Could you double-check my settings or could you create a "mvc5-beta" branch for us?

[janierdavila]

@andrasfuchs Have you tried this from your git console?:

git checkout -b mvc5-beta
...
git push origin mvc5-beta

[andrasfuchs]

@janierdavila I'm clearly not a Git pro... Using your suggested checkout -b mvc5-beta command in the console, it created a branch in my/head repo (and not in the original/base).

According to this StackOverflow entry, you are right, that's the way to go: first I need to create a new branch in my (head) repo and then create a new pull request and then push it into a new branch at the base repo.

BUT, this is what I get when I'm trying to pull it into the master (looks OK):

and this is when I enter the "mvc5-beta" as the destination branch:

[janierdavila]

@andrasfuchs Since you have push access now, I was thinking you could just push that new branch to this repo instead of your fork.

You can try these steps to add this repo to your list of remotes and push directly.

git remote add base https://github.com/funnelweblog/FunnelWeb.git
git push base mvc5-beta

Let me know if that works

[JakeGinnivan]

Hey @andrasfuchs

What you want is to have two remotes, upstream and origin. Or base as @andrasfuchs, I use upstream but either way origin should point to your fork.

To get yourself where you need to be do this

git fetch upstream
git branch mvc5-beta                # create but do not checkout the branch
git reset --hard upstream/master     # this will make your master branch in sync with upstream
git checkout mvc5-beta         # try to always work on a feature branch
git push upstream mvc5-beta

A mvc5-beta branch will then exist in the main repo. You don't do this via a pull request, you push with the last command above. Once it is in the main repo you can close this PR and open a new one between the mvc5-beta branch and master

[JakeGinnivan]

I think you just need the last command tbh, but resetting your master to not have this stuff on it is a good idea as it will stop accidental pushes of this code into master before you are ready

[andrasfuchs]

Thanks for the tips guys!

My default upstream is not the original FunnelWeb repo, but noopman's fork. I had to add the original repo as a named remote, but it seemed to work.

When I tried the git reset --hard upstreamFW/master I got a fatal error telling me that unknown revision or path not in the working tree.

Nonetheless I continued to run the git push upstreamFW mvc5-beta and I got back permission denied error.

@JakeGinnivan could you double-check my access rights?

[JakeGinnivan]

You need to do a fetch before the reset, simply adding the remote is not enough.

I added you to a team, but didn't add the team to the repo. You should have access now

[andrasfuchs]

Looks good, the source is in the mvc5-beta branch now, thanks!

[andrasfuchs]

@janierdavila I disabled MiniProfiler (in _Public.cshtml and _Private.cshtml) when I started to work with FunnelWeb, I'm not sure if it works now if you put it back.