lp:~c11emian/lenasys/1182127
- Get this branch:
- bzr branch lp:~c11emian/lenasys/1182127
Branch merges
- lenasysmaint: Pending requested
-
Diff: 83 lines (+44/-3)3 files modifiedcodeigniter/application/controllers/cms.php (+14/-0)
codeigniter/application/models/admin/admin_model.php (+28/-1)
databas.sql (+2/-2)
Related bugs
Related blueprints
Branch information
Recent revisions
- 111. By Emil Andersson
-
Added the functions getPublicCourses(), getPrivateCourses() and getStudentCours
es().
* getPublicCourses() returns all the public courses.
* getPrivateCourses() returns the private and published courses a student is registred to.
* getStudentCourses() returns both public and private courses for a student. - 109. By Gustav Hartvigsson
-
merged Jonsson:s changes:
Fixed so the bannermenu is scrollable horizontally but not vertically.
Fixed the layout between bannermenu, sidemenu and cmscontent so it doesn't overlap each. - 108. By Gustav Hartvigsson
-
Merged Bigestans:s changes:
* Started work on the viewStudents functionality... So far, displaying users works and it outputs correct and standardized html.
* Still plenty to do though. - 107. By Gustav Hartvigsson
-
Merged Bigestanas:s changes:
* Merged trunk
* Added new files relating to login functionality
* Added login and logout functions to start controller - 106. By Gustav Hartvigsson
-
merged Ohlson:s changes:
Cleaned and perfected the template layout view.
edited the body.css to make sure that the content end up at the correct position. - 105. By Gustav Hartvigsson
-
merged Jonsson:s branch:
Updated branch.
Updated getActiveCourse in user-model, and fixed so bannermenu- and cms-view uses it.
Removed links from bannermenu-view.
Fixed so cms is loaded in home-controller when user is logged in.
Added function for expand collapse courses in bannermenu-view.Removed coursemenu and statsmenu and replaced it with new combined sidemenu.
- 104. By Gustav Hartvigsson
-
Merged Jonsson:s branch:
Updated branch.
Updated getActiveCourse in user-model, and fixed so bannermenu- and cms-view uses it.
Removed links from bannermenu-view.
Fixed so cms is loaded in home-controller when user is logged in.
Added function for expand collapse courses in bannermenu-view. - 102. By Gustav Hartvigsson
-
Merged Elofs stuffs
* Finalized normalization of popups. All popups now have common CSS and HTML structure.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:lenasys