Refs #572

 * Adding Last 7 days, Last 30 days to available "default date to load Piwik"


git-svn-id: http://dev.piwik.org/svn/trunk@4217 59fd770c-687e-43c8-a1e3-f5a4ff64c105

core/Controller.php

@@ -513,6 +513,11 @@ abstract class Piwik_Controller
 		{
 			return $userSettingsDate;
 		}
+		// if last7, last30, etc.
+		if(strpos($userSettingsDate, 'last') === 0)
+		{
+			return $userSettingsDate;
+		}
 		return 'today';
 	}
 	
@@ -531,6 +536,10 @@ abstract class Piwik_Controller
 		{
 			return 'day';
 		}
+		if(strpos($userSettingsDate, 'last') === 0)
+		{
+			return 'range';
+		}
 		return $userSettingsDate;
 	}
 	

lang/en.php

@@ -634,6 +634,7 @@ $translations = array(
 	'Live_Referrer_URL' => 'Referrer URL',
 	'Live_LastMinutes' => 'Last %s minutes',
 	'Live_LastHours' => 'Last %s hours',
+	'Live_LastDays' => 'Last %s days',
 	'Live_GoalType' => 'Type',
 	'Live_GoalTime' => '1st Conversion time',
 	'Live_GoalRevenue' => 'Revenue',

plugins/CoreHome/templates/broadcast.js

@@ -302,10 +302,7 @@ broadcast.getValueFromUrl = function (param, url)
 };
 
 /*
- * help to get value from hash parameter for any given url string with provided param name
- * if no url is provided, it will get param from current address.
- * return:
- *   Empty String if param is not found.
+ * NOTE: you should probably be using broadcast.getValueFromUrl instead!
  */
 broadcast.getValueFromHash = function(param, url)
 {

plugins/CoreHome/templates/calendar.js

@@ -271,8 +271,8 @@ $(document).ready(function() {
 		  return !isNaN(d.getTime());
 		}
 	
-	 var period = broadcast.getValueFromHash('period');
+	 var period = broadcast.getValueFromUrl('period');
 	 if(period == 'range') { 
-	 	 $("#period_id_range").click();
+		 $("#period_id_range").click();
 	 }
 });
\ No newline at end of file

plugins/UsersManager/Controller.php

@@ -143,6 +143,8 @@ class Piwik_UsersManager_Controller extends Piwik_Controller
 		$view->availableDefaultDates = array(
 			'today' => Piwik_Translate('General_Today'),
 			'yesterday' => Piwik_Translate('General_Yesterday'),
+			'last7' => Piwik_Translate('Live_LastDays', 7),
+			'last30' => Piwik_Translate('Live_LastDays', 30),
 			'week' => Piwik_Translate('General_CurrentWeek'),
 			'month' => Piwik_Translate('General_CurrentMonth'),
 			'year' => Piwik_Translate('General_CurrentYear'),