From 8d06758734ef1dcae5dfa88aca6df5f9cd0be447 Mon Sep 17 00:00:00 2001 From: Topsitemakers Date: Mon, 17 Mar 2014 18:38:19 +0100 Subject: [PATCH 01/55] fixing typo: Recommnded to Recommended --- app/views/accounts/details.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/accounts/details.blade.php b/app/views/accounts/details.blade.php index 839e718ae54f..c12273121c3c 100755 --- a/app/views/accounts/details.blade.php +++ b/app/views/accounts/details.blade.php @@ -29,7 +29,7 @@ {{ Former::text('name') }} {{ Former::text('work_email')->label('Email') }} {{ Former::text('work_phone')->label('Phone') }} - {{ Former::file('logo')->max(2, 'MB')->accept('image')->inlineHelp('Supported: JPEG, GIF and PNG. Recommnded size: 120px width, 80px height') }} + {{ Former::file('logo')->max(2, 'MB')->accept('image')->inlineHelp('Supported: JPEG, GIF and PNG. Recommended size: 120px width, 80px height') }} @if (file_exists($account->getLogoPath()))
From af2289206ffd67e5fe99b04ceeb9130e714cd520 Mon Sep 17 00:00:00 2001 From: Topsitemakers Date: Mon, 17 Mar 2014 19:03:43 +0100 Subject: [PATCH 02/55] Fixing the issue with breadcrumbs and subfolders; including the link to dashboard by default on all non-dashboard pages. --- app/libraries/utils.php | 4 ++++ app/routes.php | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/libraries/utils.php b/app/libraries/utils.php index e636682a9843..88d87cd4650b 100755 --- a/app/libraries/utils.php +++ b/app/libraries/utils.php @@ -2,6 +2,10 @@ class Utils { + public static function basePath() { + return substr($_SERVER['SCRIPT_NAME'], 0, strrpos($_SERVER['SCRIPT_NAME'], '/') + 1); + } + public static function fatalError($message = false, $exception = false) { if (!$message) diff --git a/app/routes.php b/app/routes.php index 329213dec6da..09ccac47185a 100755 --- a/app/routes.php +++ b/app/routes.php @@ -163,8 +163,16 @@ HTML::macro('image_data', function($imagePath) { HTML::macro('breadcrumbs', function() { $str = '