Permalink
Browse files

html5 routing

  • Loading branch information...
1 parent 912d2ef commit 351b0de431748bab873d34fbb55e0762137697be @Michieljoris committed Feb 22, 2014
@@ -9,4 +9,4 @@
<p>June 16: Foster learning and development</p>
<p>July 7: Healthy food and drinks</p>
<p>July 21: Develop cultural competence</p>
-<p>See <a href="#!/courses#intro">more</a>.</p>
+<p>See <a href="courses/intro">more</a>.</p>
@@ -21,3 +21,6 @@
<div scroll id="policies"></div>
<div ng-show="isShow('policies')" id="policies--"></div>
+
+<div scroll id="aboutus404"></div>
+<div ng-show="is404()" >This page does not exist..</div>
@@ -1,2 +1,2 @@
-Download pdf file: <a href='documents/ASQA_Audit_Report.pdf'>Australian Skills Quality
+Download pdf file: <a href='documents/ASQA_Audit_Report.pdf' target="_self">Australian Skills Quality
Authority audit summary</a>
@@ -32,3 +32,6 @@
<div ng-show="isShow('studentfees')" >
<div id="studentfees--"> </div>
</div>
+
+<div scroll ></div>
+<div ng-show="is404()" >This page does not exist..</div>
@@ -1,17 +1,17 @@
<div class="footer-headline"><h4>Documents</h4></div>
<div class="connect-sub">
<ul>
- <li> <a href="documents/Policies and Procedures May13.pdf">Policies and Procedures</a>
+ <li> <a href="documents/Policies and Procedures May13.pdf" target="_self">Policies and Procedures</a>
</li>
- <li> <a href="documents/PRIVACY POLICY.pdf">Privacy policy</a>
+ <li> <a href="documents/PRIVACY POLICY.pdf" target="_self">Privacy policy</a>
</li>
- <li> <a href="documents/FirstDoor_StudentHandbook.pdf">Student handbook</a>
+ <li> <a href="documents/FirstDoor_StudentHandbook.pdf" target="_self">Student handbook</a>
</li>
- <li> <a href="documents/Diploma_Early_Childhood_Course_Guide.pdf">Course guide</a>
+ <li> <a href="documents/Diploma_Early_Childhood_Course_Guide.pdf" target="_self">Course guide</a>
</li>
- <li> <a href="documents/Dip ECEC enrolment print version.pdf">ECEC Enrolment</a>
+ <li> <a href="documents/Dip ECEC enrolment print version.pdf" target="_self">ECEC Enrolment</a>
</li>
- <li> <a href="documents/Individual Units enrolment print version.pdf">Individual Units Enrolment</a>
+ <li> <a href="documents/Individual Units enrolment print version.pdf" target="_self">Individual Units Enrolment</a>
</li>
</ul>
</div>
@@ -1 +1 @@
-<a href="home#welcome"><img ng-src="{{cachify('images/logo.jpg')}}"alt="logo" /></a>
+<a href=""><img ng-src="{{cachify('images/logo.jpg')}}"alt="logo" /></a>
@@ -58,3 +58,5 @@
</div>
+<div scroll id="pd"></div>
+<div ng-show="is404()" >This page does not exist..</div>
@@ -1 +1 @@
-Download pdf file: <a href='documents/Policies and Procedures May13.pdf'>Firstdoor Policies.pdf</a>
+Download pdf file: <a target="_self" href='documents/Policies and Procedures May13.pdf'>Firstdoor Policies.pdf</a>
@@ -8,21 +8,23 @@ <h2 >{{getSectionTitle(section)}}</h2>
<div ng-switch on="video.provider" >
<span ng-switch-when="text" ng-bind-html-unsafe="video.title"></span>
<span ng-switch-default>
- <a id="videoTitle" href="#" ng-click="open($event, video)" ng-bind-html-unsafe="video.title"> </a>
+ <a id="videoTitle" ng-click="open($event, video)" ng-bind-html-unsafe="video.title"
+ style="cursor:pointer"
+ > </a>
</span>
</div>
<div class="container" >
<div class="row" >
<div ng-switch on="video.provider" class="span1" >
- <a ng-switch-when="youtube" href="#"
+ <a ng-switch-when="youtube" style="cursor:pointer"
ng-click="open($event, video)">
<div class="video-thumbnail embed-container ratio-4-3 ">
- <img href="#" ng-src="http://img.youtube.com/vi/{{video.id}}/2.jpg"
+ <img href="" ng-src="http://img.youtube.com/vi/{{video.id}}/2.jpg"
class="mymage" style="max-height:75px;" />
</div>
</a>
- <a ng-switch-when="vimeo" href="#"
+ <a ng-switch-when="vimeo" style="cursor:pointer"
ng-click="open($event, video)">
<div id="{{video.id}}"
class="video-thumbnail embed-container ratio-4-3">
@@ -1,8 +1,8 @@
-<a href="#" id="uniqueid-show" class="showLink"
+<a id="uniqueid-show" class="showLink" style="cursor:pointer"
onclick="showHide('uniqueid');return false;">Show..</a>
</p>
<div id="uniqueid" class="more">
- <p><a href="#" id="uniqueid-hide" class="hideLink"
+ <p><a id="uniqueid-hide" class="hideLink" style="cursor:pointer"
onclick="showHide('uniqueid');return false;">Hide</a></p>
inserthere
</div>
@@ -1,11 +1,11 @@
-<a href="#" id="shchildren-show" class="showLink"
+<a href="" id="shchildren-show" class="showLink"
onclick="showHide('shchildren');return false;">Show..</a>
</p>
<div id="shchildren" class="more">
- <p><a href="#" id="shchildren-hide" class="hideLink"
+ <p><a href="" id="shchildren-hide" class="hideLink"
onclick="showHide('shchildren');return false;">Hide</a></p>
<div id="pd_children_info_md--"></div>
- <p><a href="#" id="shchildren-hide" class="hideLink"
+ <p><a href="" id="shchildren-hide" class="hideLink"
onclick="showHide('shchildren');return false;">Hide</a></p>
</div>
@@ -1,7 +1,7 @@
-<a href="#" id="shinspired-show" class="showLink"
+<a href="" id="shinspired-show" class="showLink"
onclick="showHide('shinspired');return false;">Show..</a>
<div id="shinspired" class="more">
- <p><a href="#" id="shinspired-hide" class="hideLink"
+ <p><a href="" id="shinspired-hide" class="hideLink"
onclick="showHide('shinspired');return false;">Hide</a></p>
<div id="pd_inspired_info_md--"></div>
</div>
@@ -6,7 +6,7 @@
<ul>
<div ng-repeat="link in page.links">
<li ng-class="isSelected(link.route)" >
- <a ng-href="/{{link.route}}">{{link.label}}</a>
+ <a ng-href="/{{link.route}}" target="{{link.file && '_self' || ''}}">{{link.label}} </a>
<ul>
<li ng-class="isSelected(sublink.route)"ng-repeat="sublink in link.sub">
@@ -37,3 +37,6 @@
<div id="quiz--"> </div>
</div>
+
+<div scroll id="welcome404"></div>
+<div ng-show="is404()" >This page does not exist..</div>
View
@@ -22,9 +22,16 @@ angular.module('ngView', [],
];
mapping.forEach(function(m) {
- $routeProvider.when('/' + m[0], {
- templateUrl: '//' + document.location.host + '/' + m[1], controller: m[2] ? m[2] : DefaultCntl });
+ var route ='/' + m[0];
+ $routeProvider.when(route,
+ { templateUrl: '//' + document.location.host + '/' + m[1],
+ controller: m[2] ? m[2] : DefaultCntl });
+ route ='/' + m[0] + '/:section';
+ $routeProvider.when(route,
+ { templateUrl: '//' + document.location.host + '/' + m[1],
+ controller: m[2] ? m[2] : DefaultCntl });
});
+
$routeProvider.otherwise( {
templateUrl: '//' + document.location.host +
View
@@ -156,79 +156,79 @@ var js = [
var mainMenuTree = [
- { label: 'Home', icon: '', route: 'home#welcome'//href: '/'
+ { label: 'Home', icon: '', href: '/'
,sub: [
- // { label: 'Welcome', route: 'home#welcome', scroll: true}
- { label: 'Specialists in Early Childhood training and development', route: 'home#specialists', scroll: true}
- ,{ label: 'Engaging resources and environments', route: 'home#engaging', scroll: true}
- ,{ label: 'Your personal mentor ', route: 'home#mentor', scroll: true}
- ,{ label: 'Constructive and timely assessment', route: 'home#constructive', scroll: true}
- // ,{ label: '', route: 'home#quiz', scroll: true}
- // ,{ label: 'Quiz: discover your preferred learning style', route: 'home#quiz', scroll: true}
+ // { label: 'Welcome', route: 'home/welcome', scroll: true}
+ { label: 'Specialists in Early Childhood training and development', route: 'home/specialists', scroll: true}
+ ,{ label: 'Engaging resources and environments', route: 'home/engaging', scroll: true}
+ ,{ label: 'Your personal mentor ', route: 'home/mentor', scroll: true}
+ ,{ label: 'Constructive and timely assessment', route: 'home/constructive', scroll: true}
+ // ,{ label: '', route: 'home/quiz', scroll: true}
+ // ,{ label: 'Quiz: discover your preferred learning style', route: 'home/quiz', scroll: true}
- ,{ label: 'Australian Skills Quality Authority audit summary', route: 'home#asqa', scroll: true}
+ ,{ label: 'Australian Skills Quality Authority audit summary', route: 'home/asqa', scroll: true}
]
// sub: [
// { label: 'Contact us', route: 'contactus', scroll: true}
// ]
}
- ,{ label: 'About us', icon: '', route: 'aboutus#vision',
+ ,{ label: 'About us', icon: '', route: 'aboutus/vision',
sub: [
- { label: 'Our company', route: 'aboutus#vision', scroll: true
+ { label: 'Our company', route: 'aboutus/vision', scroll: true
,sub: [
- { label: 'Vision', icon: '', route: 'aboutus#vision'}
- ,{ label: 'Mission', route: 'aboutus#mission'}
- ,{ label: 'Our student approach', route: 'aboutus#approach'}
- ,{ label: 'Values', route: 'aboutus#values'}
+ { label: 'Vision', icon: '', route: 'aboutus/vision'}
+ ,{ label: 'Mission', route: 'aboutus/mission'}
+ ,{ label: 'Our student approach', route: 'aboutus/approach'}
+ ,{ label: 'Values', route: 'aboutus/values'}
]
}
- ,{ label: 'Our name and logo', route: 'aboutus#namelogo', scroll: true}
- ,{ label: 'Our people', route: 'aboutus#people', scroll: true}
- ,{ label: 'First door policies', route: 'aboutus#policies', scroll: true}
- // ,{ label: 'Our people', route: 'index.html#!/aboutus#people'}
+ ,{ label: 'Our name and logo', route: 'aboutus/namelogo', scroll: true}
+ ,{ label: 'Our people', route: 'aboutus/people', scroll: true}
+ ,{ label: 'First door policies', route: 'aboutus/policies', scroll: true}
+ // ,{ label: 'Our people', route: 'index.html/!/aboutus#people'}
]
}
- ,{ label: 'Professional development', icon: '', route: 'pd#intro'
+ ,{ label: 'Professional development', icon: '', route: 'pd/intro'
,sub: [
- { label: 'The inspired educator', route: 'pd#inspired', scroll: true}
- ,{ label: 'Observation, documentation, planning and evaluating', route: 'pd#observing', scroll: true}
- ,{ label: 'Environment and experiences', route: 'pd#environment', scroll: true}
- ,{ label: 'Developing cooperative behaviour', route: 'pd#coop', scroll: true}
- ,{ label: 'Evaluation and reflective practice', route: 'pd#evaluation', scroll: true}
- ,{ label: 'Children at risk', route: 'pd#children', scroll: true}
- ,{ label: 'Identify and manage risk', route: 'pd#risk', scroll: true}
- ,{ label: 'Customised workshop', route: 'pd#customised', scroll: true}
- ,{ label: 'Fees', route: 'pd#pdfees', scroll: true}
+ { label: 'The inspired educator', route: 'pd/inspired', scroll: true}
+ ,{ label: 'Observation, documentation, planning and evaluating', route: 'pd/observing', scroll: true}
+ ,{ label: 'Environment and experiences', route: 'pd/environment', scroll: true}
+ ,{ label: 'Developing cooperative behaviour', route: 'pd/coop', scroll: true}
+ ,{ label: 'Evaluation and reflective practice', route: 'pd/evaluation', scroll: true}
+ ,{ label: 'Children at risk', route: 'pd/children', scroll: true}
+ ,{ label: 'Identify and manage risk', route: 'pd/risk', scroll: true}
+ ,{ label: 'Customised workshop', route: 'pd/customised', scroll: true}
+ ,{ label: 'Fees', route: 'pd/pdfees', scroll: true}
]
}
- ,{ label: 'Accredited training', icon: '', route: 'courses#intro'
+ ,{ label: 'Accredited training', icon: '', route: 'courses/intro'
,sub: [
- { label: 'Diploma of Early Childhood Education and Care', route: 'courses#children_ecec',
+ { label: 'Diploma of Early Childhood Education and Care', route: 'courses/children_ecec',
scroll: true}
- ,{ label: 'Diploma of Management ', route: 'courses#diploma_management', scroll: true}
- ,{ label: 'Certificate IV in Training and Assessment', route: 'courses#certivtraining', scroll: true}
- // ,{ label: 'Aged care', route: 'courses#agedcare'}
+ ,{ label: 'Diploma of Management ', route: 'courses/diploma_management', scroll: true}
+ ,{ label: 'Certificate IV in Training and Assessment', route: 'courses/certivtraining', scroll: true}
+ // ,{ label: 'Aged care', route: 'courses/agedcare'}
]
}
- ,{ label: 'Resources', icon: '', route: 'resources#motivation'
+ ,{ label: 'Resources', icon: '', route: 'resources/motivation'
,sub: [
- { label: 'Motivation', route: 'resources#motivation', scroll: true
+ { label: 'Motivation', route: 'resources/motivation', scroll: true
}
- ,{ label: 'Early childhood', route: 'resources#earlychildhood', scroll: true
+ ,{ label: 'Early childhood', route: 'resources/earlychildhood', scroll: true
// ,sub: [
// { label: 'Educational leaders', route: 'resources'}
// ]
}
- ,{ label: 'Learning organisations', route: 'resources#learningorganisations', scroll:true}
- ,{ label: 'Learning', route: 'resources#learning', scroll:true
+ ,{ label: 'Learning organisations', route: 'resources/learningorganisations', scroll:true}
+ ,{ label: 'Learning', route: 'resources/learning', scroll:true
// ,sub: [
- // { label: 'Quiz', route: 'resources#quiz'}
+ // { label: 'Quiz', route: 'resources/quiz'}
// ]
}
- ,{ label: 'Leadership and Management', route: 'resources#leadership', scroll:true}
+ ,{ label: 'Leadership and Management', route: 'resources/leadership', scroll:true}
,{ label: 'Quiz: discover your preferred learning style', route: 'quiz', scroll: true}
// ,{ label: '(tryouts)' ,route: 'resources'
@@ -416,8 +416,8 @@ var exports = {
}
//group the script and link blocks and concatenate all files listed in a block
- // ,concatenate: !develop_mode
- ,concatenate: true
+ ,concatenate: !develop_mode
+ // ,concatenate: true
//make sure to load the resources for custom components, the files get added
//to the first script and link blocks.
,extras: ['flex-slider', 'cssmenu', 'showhide']
@@ -451,6 +451,7 @@ var exports = {
ids: {
title: '<title>Firstdoor - Leaders in developing capability</title>'
,baseHref: '<base href="http://localhost:9001"">'
+ // ,baseHref: '<base href="/"">'
// ,image_courses: '<img class="" src="images/slides/tab_accredited_training.jpg" />'
// ,image_aboutus: '<img class="" src="images/slides/tab_about_us.jpg" />'
// ,image_pd: '<img class="" src="images/slides/tab_professional_development.jpg" />'
@@ -1 +0,0 @@
-33398
Oops, something went wrong.

0 comments on commit 351b0de

Please sign in to comment.