diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2017-10-02 20:21:04 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2017-10-02 20:21:04 +0200 |
commit | 99bf24fd3e5997219799ccc23f69527f6fb4d759 (patch) | |
tree | c76bf244b3d044a4ec60f14171d8a39f1e94dbbe | |
parent | 96861f4dd8da7574e1814bbd91faae23aac049c6 (diff) | |
download | sourceyard-99bf24fd3e5997219799ccc23f69527f6fb4d759.tar.gz sourceyard-99bf24fd3e5997219799ccc23f69527f6fb4d759.tar.bz2 |
Implement removal of skill records.
-rw-r--r-- | lib/Savane/Schema/Result/PeopleSkillInventory.pm | 9 | ||||
-rw-r--r-- | public/css/Savannah.css | 2 | ||||
-rw-r--r-- | public/css/internal/base.css | 5 | ||||
-rw-r--r-- | templates/example/welcome.html.ep | 13 | ||||
-rw-r--r-- | templates/include/pagefooter.html.ep | 3 | ||||
-rw-r--r-- | templates/layouts/account.html.ep | 1 | ||||
-rw-r--r-- | templates/layouts/default.html.ep | 1 | ||||
-rw-r--r-- | templates/layouts/user.html.ep | 1 |
8 files changed, 16 insertions, 19 deletions
diff --git a/lib/Savane/Schema/Result/PeopleSkillInventory.pm b/lib/Savane/Schema/Result/PeopleSkillInventory.pm index d421180..a0c3ab7 100644 --- a/lib/Savane/Schema/Result/PeopleSkillInventory.pm +++ b/lib/Savane/Schema/Result/PeopleSkillInventory.pm @@ -87,11 +87,14 @@ __PACKAGE__->set_primary_key("skill_inventory_id"); # You can replace this text with custom code or comments, and it will be preserved on regeneration __PACKAGE__->has_one(skill => 'Savane::Schema::Result::PeopleSkill', - { 'foreign.skill_id' => 'self.skill_id' }); + { 'foreign.skill_id' => 'self.skill_id' }, + { cascade_delete => 0 }); __PACKAGE__->has_one(skill_level => 'Savane::Schema::Result::PeopleSkillLevel', - { 'foreign.skill_level_id' => 'self.skill_level_id' }); + { 'foreign.skill_level_id' => 'self.skill_level_id' }, + { cascade_delete => 0 }); __PACKAGE__->has_one(skill_experience => 'Savane::Schema::Result::PeopleSkillYear', - { 'foreign.skill_year_id' => 'self.skill_year_id' }); + { 'foreign.skill_year_id' => 'self.skill_year_id' }, + { cascade_delete => 0 }); __PACKAGE__->belongs_to('user' => 'Savane::Schema::Result::User', 'user_id'); diff --git a/public/css/Savannah.css b/public/css/Savannah.css index 833ce15..e6006a3 100644 --- a/public/css/Savannah.css +++ b/public/css/Savannah.css @@ -64,8 +64,6 @@ a:active { color: #ff0000; } /* border: solid #998855; */ border: solid #e0c080; border-width: 0 thin thin 0; - margin-left: 1%; - margin-right: 1%; } .warn { color: #aa2200; } .error { font-weight: bold; color: #aa2200; } diff --git a/public/css/internal/base.css b/public/css/internal/base.css index 906ad78..14535de 100644 --- a/public/css/internal/base.css +++ b/public/css/internal/base.css @@ -922,4 +922,7 @@ table.input thead td { text-align: center; border-bottom: 1px solid gray; } -
\ No newline at end of file + +div.footer { + border-top: 1px solid gray; +}
\ No newline at end of file diff --git a/templates/example/welcome.html.ep b/templates/example/welcome.html.ep deleted file mode 100644 index 1efd098..0000000 --- a/templates/example/welcome.html.ep +++ /dev/null @@ -1,13 +0,0 @@ -% layout 'default'; -% title 'Welcome'; -<h2><%= $msg %></h2> -<p> - This page was generated from the template "templates/example/welcome.html.ep" - and the layout "templates/layouts/default.html.ep", - <%= link_to 'click here' => url_for %> to reload the page or - <%= link_to 'here' => '/index.html' %> to move forward to a static page. - % if (config 'perldoc') { - To learn more, you can also browse through the documentation - <%= link_to 'here' => '/perldoc' %>. - % } -</p> diff --git a/templates/include/pagefooter.html.ep b/templates/include/pagefooter.html.ep new file mode 100644 index 0000000..b60ee7f --- /dev/null +++ b/templates/include/pagefooter.html.ep @@ -0,0 +1,3 @@ + <div class="footer"> + <p>Powered by Sourceyard</p> + </div> diff --git a/templates/layouts/account.html.ep b/templates/layouts/account.html.ep index f30acd5..60cfb3e 100644 --- a/templates/layouts/account.html.ep +++ b/templates/layouts/account.html.ep @@ -22,5 +22,6 @@ </div> <!-- main --> </div> <!-- realbody --> +%= include 'include/pagefooter' </body> </html> diff --git a/templates/layouts/default.html.ep b/templates/layouts/default.html.ep index 5d9106f..1524e6d 100644 --- a/templates/layouts/default.html.ep +++ b/templates/layouts/default.html.ep @@ -42,5 +42,6 @@ </div> <!-- main --> </div> <!-- realbody --> +%= include 'include/pagefooter' </body> </html> diff --git a/templates/layouts/user.html.ep b/templates/layouts/user.html.ep index 89fe7e7..6ec505a 100644 --- a/templates/layouts/user.html.ep +++ b/templates/layouts/user.html.ep @@ -20,5 +20,6 @@ <%= content %> </div> <!-- main --> </div> <!-- realbody --> +%= include 'include/pagefooter' </body> </html> |