diff --git a/CoreVersions/0.2.0/Frameworks/.DS_Store b/CoreVersions/0.2.0/Frameworks/.DS_Store new file mode 100644 index 0000000..19f64a1 Binary files /dev/null and b/CoreVersions/0.2.0/Frameworks/.DS_Store differ diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/User/AddressBooks.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/User/AddressBooks.php index ed0b980..20ef14f 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/User/AddressBooks.php +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/User/AddressBooks.php @@ -124,8 +124,22 @@ class AddressBooks extends \Flake\Core\Controller { $oView->setData("user", $this->oUser); # Render list of address books + $aAddressBooks = array(); + $oAddressBooks = $this->oUser->getAddressBooksBaseRequester()->execute(); - $oView->setData("addressbooks", $oAddressBooks); + + reset($oAddressBooks); + foreach($oAddressBooks as $addressbook) { + $aAddressBooks[] = array( + "linkedit" => \BaikalAdmin\Controller\User\AddressBooks::linkEdit($addressbook), + "linkdelete" => \BaikalAdmin\Controller\User\AddressBooks::linkDelete($addressbook), + "icon" => $addressbook->icon(), + "label" => $addressbook->label(), + "description" => $addressbook->get("description"), + ); + } + + $oView->setData("addressbooks", $aAddressBooks); # Messages $sMessages = implode("\n", $this->aMessages); @@ -138,6 +152,12 @@ class AddressBooks extends \Flake\Core\Controller { } $oView->setData("form", $sForm); + $oView->setData("titleicon", \Baikal\Model\AddressBook::bigicon()); + $oView->setData("modelicon", $this->oUser->mediumIcon()); + $oView->setData("modellabel", $this->oUser->label()); + $oView->setData("linkback", \BaikalAdmin\Controller\Users::link()); + $oView->setData("linknew", \BaikalAdmin\Controller\User\AddressBooks::linkNew()); + $oView->setData("addressbookicon", \Baikal\Model\AddressBook::icon()); return $oView->render(); } diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/User/Calendars.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/User/Calendars.php index 7bb5f2a..ebafb00 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/User/Calendars.php +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/User/Calendars.php @@ -130,7 +130,19 @@ class Calendars extends \Flake\Core\Controller { # List of calendars $oCalendars = $this->oUser->getCalendarsBaseRequester()->execute(); - $oView->setData("calendars", $oCalendars); + $aCalendars = array(); + + foreach($oCalendars as $calendar) { + $aCalendars[] = array( + "linkedit" => \BaikalAdmin\Controller\User\Calendars::linkEdit($calendar), + "linkdelete" => \BaikalAdmin\Controller\User\Calendars::linkDelete($calendar), + "icon" => $calendar->icon(), + "label" => $calendar->label(), + "description" => $calendar->get("description"), + ); + } + + $oView->setData("calendars", $aCalendars); # Messages $sMessages = implode("\n", $this->aMessages); @@ -143,7 +155,13 @@ class Calendars extends \Flake\Core\Controller { } $oView->setData("form", $sForm); - + $oView->setData("titleicon", \Baikal\Model\Calendar::bigicon()); + $oView->setData("modelicon", $this->oUser->mediumicon()); + $oView->setData("modellabel", $this->oUser->label()); + $oView->setData("linkback", \BaikalAdmin\Controller\Users::link()); + $oView->setData("linknew", \BaikalAdmin\Controller\User\Calendars::linkNew()); + $oView->setData("calendaricon", \Baikal\Model\Calendar::icon()); + return $oView->render(); } diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Users.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Users.php index b37eced..b6c9c03 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Users.php +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Users.php @@ -102,8 +102,26 @@ class Users extends \Flake\Core\Controller { $oView = new \BaikalAdmin\View\Users(); # List of users + $aUsers = array(); $oUsers = \Baikal\Model\User::getBaseRequester()->execute(); - $oView->setData("users", $oUsers); + + reset($oUsers); + foreach($oUsers as $user) { + $aUsers[] = array( + "linkcalendars" => \BaikalAdmin\Controller\Users::linkCalendars($user), + "linkaddressbooks" => \BaikalAdmin\Controller\Users::linkAddressBooks($user), + "linkedit" => \BaikalAdmin\Controller\Users::linkEdit($user), + "linkdelete" => \BaikalAdmin\Controller\Users::linkDelete($user), + "mailtouri" => $user->getMailtoURI(), + "username" => $user->get("username"), + "displayname" => $user->get("displayname"), + "email" => $user->get("email"), + ); + } + + $oView->setData("users", $aUsers); + $oView->setData("calendaricon", \Baikal\Model\Calendar::icon()); + $oView->setData("usericon", \Baikal\Model\User::icon()); # Messages $sMessages = implode("\n", $this->aMessages); @@ -117,6 +135,8 @@ class Users extends \Flake\Core\Controller { } $oView->setData("form", $sForm); + $oView->setData("usericon", \Baikal\Model\User::icon()); + $oView->setData("linknew", \BaikalAdmin\Controller\Users::linkNew()); return $oView->render(); } diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Dashboard.html b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Dashboard.html index e7f3e1b..142fc28 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Dashboard.html +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Dashboard.html @@ -1,3 +1,4 @@ +{% autoescape false %}

Dashboard

@@ -9,28 +10,26 @@

Version

-

This systems runs Baïkal

+

This systems runs Baïkal {{ BAIKAL_VERSION }}

Services

- @@ -39,24 +38,22 @@ - + - +
CalDAV{{ caldavtext }}
CardDAV{{ carddavtext }}

License and credits

- + {% set url = 'http://baikal.codr.fr/version/' ~ BAIKAL_VERSION ~ '/about' %}

Baïkal is open source software, and released under the terms of the GNU GPL v3.

Baïkal is developped by Jérôme Schneider. You can contact him at mail@jeromeschneider.fr.

Baïkal is based upon other open source projects. Read the README.md file to learn about that.

-

+

{{ url }}

@@ -72,7 +69,7 @@ Registered users - + {{ nbusers }} @@ -83,11 +80,11 @@ Number of calendars - + {{ nbcalendars }} Number of events - + {{ nbevents }} @@ -98,14 +95,15 @@ Number of address books - + {{ nbbooks }} Number of contacts - + {{ nbcontacts }} - \ No newline at end of file + +{% endautoescape %} \ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Install/Initialize.html b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Install/Initialize.html index 0ee9cb9..72791e3 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Install/Initialize.html +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Install/Initialize.html @@ -1,8 +1,11 @@ +{% autoescape false %}

Baïkal initialization wizard

-

Configure your new Baïkal installation.

+

Configure your new Baïkal {{ baikalversion }} installation.

- - \ No newline at end of file +{{ message }} +{{ form }} + +{% endautoescape %} \ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Login.html b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Login.html index f6e4d54..28077ca 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Login.html +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Login.html @@ -1,25 +1,27 @@ +{% autoescape false %}

Authentication

Please authenticate to access Baïkal Web Admin.

- +{{ message }} -
- + +

- +

- +

-
\ No newline at end of file + +{% endautoescape %} \ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Navigation/Topbar.html b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Navigation/Topbar.html index 6165ea2..55adf15 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Navigation/Topbar.html +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Navigation/Topbar.html @@ -1,3 +1,4 @@ +{% autoescape false %} +{% endautoescape %} \ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Page/baikal-logo-20-white.png b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Page/baikal-logo-20-white.png deleted file mode 100755 index ec2b4a1..0000000 Binary files a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Page/baikal-logo-20-white.png and /dev/null differ diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Page/baikal-logo-30-white.png b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Page/baikal-logo-30-white.png deleted file mode 100755 index c1eb08f..0000000 Binary files a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Page/baikal-logo-30-white.png and /dev/null differ diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Page/baikal-text-18.png b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Page/baikal-text-18.png deleted file mode 100755 index 7a6f1ee..0000000 Binary files a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Page/baikal-text-18.png and /dev/null differ diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Page/index.html b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Page/index.html index 1b7d01b..ca941a0 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Page/index.html +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Page/index.html @@ -1,9 +1,10 @@ +{% autoescape false %} - {pagetitle} - + {{ pagetitle }} + @@ -17,13 +18,13 @@ - {head} + {{ head }} - {navbar} + {{ navbar }}
- {Payload} + {{ Payload }}