diff -Nru zentyal-core-3.1.12/ChangeLog zentyal-core-3.1.13/ChangeLog --- zentyal-core-3.1.12/ChangeLog 2013-09-17 09:17:09.000000000 +0000 +++ zentyal-core-3.1.13/ChangeLog 2013-09-18 12:43:57.000000000 +0000 @@ -1,3 +1,7 @@ +3.1.13 + + Added missing EBox::Gettext uses, fixes crash in view logs refresh + + Minor CSS style fixes + + Added missing use statement in EBox::Types::MultiStateAction 3.1.12 + Do not crash if /etc/timezone does not exist + Clean /var/lib/zentyal/tmp at the first moments of boot instead of diff -Nru zentyal-core-3.1.12/debian/changelog zentyal-core-3.1.13/debian/changelog --- zentyal-core-3.1.12/debian/changelog 2013-09-17 09:17:09.000000000 +0000 +++ zentyal-core-3.1.13/debian/changelog 2013-09-18 12:43:59.000000000 +0000 @@ -1,3 +1,9 @@ +zentyal-core (3.1.13) precise; urgency=low + + * New upstream release + + -- José A. Calvo Wed, 18 Sep 2013 14:43:58 +0200 + zentyal-core (3.1.12) precise; urgency=low * New upstream release diff -Nru zentyal-core-3.1.12/debian/po/templates.pot zentyal-core-3.1.13/debian/po/templates.pot --- zentyal-core-3.1.12/debian/po/templates.pot 2013-09-17 09:17:11.000000000 +0000 +++ zentyal-core-3.1.13/debian/po/templates.pot 2013-09-18 12:44:00.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: zentyal-core\n" "Report-Msgid-Bugs-To: zentyal-core@packages.debian.org\n" -"POT-Creation-Date: 2013-09-17 11:17+0200\n" +"POT-Creation-Date: 2013-09-18 14:44+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru zentyal-core-3.1.12/extra/css/jquery-ui.css.mas zentyal-core-3.1.13/extra/css/jquery-ui.css.mas --- zentyal-core-3.1.12/extra/css/jquery-ui.css.mas 2013-09-17 09:17:09.000000000 +0000 +++ zentyal-core-3.1.13/extra/css/jquery-ui.css.mas 2013-09-18 12:43:58.000000000 +0000 @@ -837,13 +837,7 @@ /* Interaction states ----------------------------------*/ -.ui-state-default, -.ui-widget-content .ui-state-default, -.ui-widget-header .ui-state-default { - border: 1px solid #cccccc; - font-weight: bold; - color: #1c94c4; -} + .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { diff -Nru zentyal-core-3.1.12/extra/css/public.css.mas zentyal-core-3.1.13/extra/css/public.css.mas --- zentyal-core-3.1.12/extra/css/public.css.mas 2013-09-17 09:17:09.000000000 +0000 +++ zentyal-core-3.1.13/extra/css/public.css.mas 2013-09-18 12:43:58.000000000 +0000 @@ -275,7 +275,9 @@ margin-bottom: 15px; margin-left:0px; } - +.summarySection .stitle{ + padding: 10px; +} .summarySection tr { vertical-align: center; } @@ -895,12 +897,12 @@ .stitle { color: #4c4c4c; - margin: 3px; font-weight: bold; padding: 1px; line-height: 14px; } + .trimp { border-bottom: 1px solid #eeeeee; background-color: #ffe9e8; @@ -1243,14 +1245,14 @@ } .widgetBoxIn { - padding:10px 0px; + padding:10px; } .widgetBoxIn > .summarySection {margin-bottom:0px;} .sectionContent { - width: 98%; + width: 100%; } @@ -1289,17 +1291,17 @@ .dashboardTable thead { color: white; - background-color: <% $dashboard_thead_bg_color %>; + background-color: #888; } -.dashboardTable th { - font-family: Verdana, 'Bitstream Vera Sans', sans-serif; - padding: 3px; - font-weight: bold; - vertical-align: middle; +.dashboardTable td, .dashboardTable th { + padding: 5px 7px; + vertical-align: middle; + text-align: left; + border-right: 1px solid #ddd; } -.dashboardTable td { - padding: 3px; +.dashboardTable td:last-child, .dashboardTable th:last-child{ + border-right: none; } .dashboardTable td a { @@ -1316,6 +1318,11 @@ .dashboardTable tr.highlight { background: #E58A22; } +.dashboardTable + div{ + background-color: whitesmoke; + padding: 10px; +} + #nav li.menuSeparator{ border-top: none; } @@ -1330,31 +1337,19 @@ } .linksBlock { - display: block; float: left; - width: 170px; - margin-right: 12px; - margin-bottom: -12px; -} - -.linksTitle { - width: 100%; - color: #4c4c4c; - background-color: #ffffff; - text-align: left; - font-weight: bold; - padding: 3px 4px 3px 4px; + width: 50%; } - .linksBlock a { - color: #03A9F0; + color: #00ADD0; +} +.linksBlock ul { + list-style: none ; + margin: 0; + padding: 0 10px 10px 10px; } - .linksBlock li { - list-style: none; - margin-bottom: 14px; - margin-left: -18px; - margin-top: -8px; + padding: 3px 0; } diff -Nru zentyal-core-3.1.12/src/EBox/Types/MultiStateAction.pm zentyal-core-3.1.13/src/EBox/Types/MultiStateAction.pm --- zentyal-core-3.1.12/src/EBox/Types/MultiStateAction.pm 2013-09-17 09:17:09.000000000 +0000 +++ zentyal-core-3.1.13/src/EBox/Types/MultiStateAction.pm 2013-09-18 12:43:58.000000000 +0000 @@ -17,6 +17,8 @@ package EBox::Types::MultiStateAction; +use EBox::Types::Action; + sub new { my $class = shift; diff -Nru zentyal-core-3.1.12/src/templates/ajax/treeView.mas zentyal-core-3.1.13/src/templates/ajax/treeView.mas --- zentyal-core-3.1.12/src/templates/ajax/treeView.mas 2013-09-17 09:17:09.000000000 +0000 +++ zentyal-core-3.1.13/src/templates/ajax/treeView.mas 2013-09-18 12:43:57.000000000 +0000 @@ -2,6 +2,7 @@ $model <%init> + use EBox::Gettext; my %types = %{$model->nodeTypes()}; my $treeId = "tree_" . $model->name(); my $treeViewerId = "treeviewer_" . $model->name(); diff -Nru zentyal-core-3.1.12/src/templates/dashboard/links-widget.mas zentyal-core-3.1.13/src/templates/dashboard/links-widget.mas --- zentyal-core-3.1.12/src/templates/dashboard/links-widget.mas 2013-09-17 09:17:09.000000000 +0000 +++ zentyal-core-3.1.13/src/templates/dashboard/links-widget.mas 2013-09-18 12:43:57.000000000 +0000 @@ -31,7 +31,7 @@ % }
-
<% __s('Community') %>
+
<% __s('Community') %>
  • <& .subscriptionElement, @@ -55,8 +55,7 @@
-
-
<% __s('Business') %>
+
<% __s('Business') %>
-
<%def .subscriptionElement> <%args> diff -Nru zentyal-core-3.1.12/src/templates/dashboard/list.mas zentyal-core-3.1.13/src/templates/dashboard/list.mas --- zentyal-core-3.1.12/src/templates/dashboard/list.mas 2013-09-17 09:17:09.000000000 +0000 +++ zentyal-core-3.1.13/src/templates/dashboard/list.mas 2013-09-18 12:43:57.000000000 +0000 @@ -18,11 +18,11 @@ % } else { % $list_display = 'none'; % } -' style='display: <% $list_display %>;' class='dashboardTable'> +
' class='dashboardTable'> % foreach my $colTitle (@{$item->{colTitles}}) { - + % } diff -Nru zentyal-core-3.1.12/src/templates/headerWithRefresh.mas zentyal-core-3.1.13/src/templates/headerWithRefresh.mas --- zentyal-core-3.1.12/src/templates/headerWithRefresh.mas 2013-09-17 09:17:09.000000000 +0000 +++ zentyal-core-3.1.13/src/templates/headerWithRefresh.mas 2013-09-18 12:43:57.000000000 +0000 @@ -4,6 +4,9 @@ $destination $favicon => '/favicon.ico' +<%init> +use EBox::Gettext; + Binary files /tmp/Jn8CoPn0cB/zentyal-core-3.1.12/www/images/download.gif and /tmp/UiJPPH8GPE/zentyal-core-3.1.13/www/images/download.gif differ Binary files /tmp/Jn8CoPn0cB/zentyal-core-3.1.12/www/images/save.gif and /tmp/UiJPPH8GPE/zentyal-core-3.1.13/www/images/save.gif differ Binary files /tmp/Jn8CoPn0cB/zentyal-core-3.1.12/www/images/start.gif and /tmp/UiJPPH8GPE/zentyal-core-3.1.13/www/images/start.gif differ Binary files /tmp/Jn8CoPn0cB/zentyal-core-3.1.12/www/images/stop_p.gif and /tmp/UiJPPH8GPE/zentyal-core-3.1.13/www/images/stop_p.gif differ
<% $colTitle %><% $colTitle %>