Commit f52d87c6 authored by Michael Herold's avatar Michael Herold
Browse files

Blind commit

parent a117763f
......@@ -3,4 +3,4 @@ php:
- 5.6
- 7.0
install:
- composer install
- make dev
......@@ -32,4 +32,4 @@ dev-fonts:
rm *.otf
dev-serve:
php -S localhost:8080 -t src/htdocs src/htdocs/index.php
php5 -S localhost:8080 -t src/htdocs src/htdocs/index.php
......@@ -17,7 +17,8 @@
"hemio/form": "0.4.*"
},
"require-dev": {
"phpunit/phpunit": "5.*"
"phpunit/phpunit": "5.*",
"producer/producer": "^2.1"
},
"autoload": {
"psr-4": {
......
This diff is collapsed.
<?php
/*
* Copyright (C) 2015 Michael Herold <quabla@hemio.de>
*
......@@ -19,26 +20,24 @@
namespace hemio\edentata\module\email_list;
use hemio\edentata\gui;
use hemio\html\Str as String;
use hemio\html\Str;
/**
* Description of Overview
*
* @author Michael Herold <quabla@hemio.de>
*/
class Overview extends Window
{
class Overview extends Window {
public function content()
{
public function content() {
$window = $this->newWindow(_('Mailing Lists'), null, false);
$window->addButtonRight(
new gui\LinkButton(
$this->module->request->derive('list_create')
, _('New List')
)
, true);
new gui\LinkButton(
$this->module->request->derive('list_create')
, _('New List')
)
, true);
$window->addChild($this->lists());
......@@ -46,8 +45,7 @@ class Overview extends Window
return $window;
}
protected function lists()
{
protected function lists() {
$lists = $this->db->listSelect()->fetchAll();
if (!count($lists)) {
......@@ -55,16 +53,16 @@ class Overview extends Window
} else {
$listbox = new gui\Listbox;
foreach ($lists as $list) {
$addr = $list['localpart'].'@'.$list['domain'];
$addr = $list['localpart'] . '@' . $list['domain'];
$listbox->addLinkEntry(
$this->module->request->derive('list_details', $addr)
,
new String($addr.' ('.$list['num_subscribers'].')')
, $list['backend_status']
$this->module->request->derive('list_details', $addr)
, new Str($addr . ' (' . $list['num_subscribers'] . ')')
, $list['backend_status']
);
}
return $listbox;
}
}
}
......@@ -122,7 +122,7 @@ input, textarea {
order: 2;
}
input, textarea {
input:not([type="button"]), textarea {
@extend .input_position;
}
......
......@@ -30,7 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
.button {
@extend .input_style;
@extend .input_position;
//@extend .input_position;
width: auto;
@include button-background($button-color);
......@@ -39,6 +39,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
min-width: 7.5em;
transition-property: opacity;
transition-duration: 400ms;
white-space: nowrap;
}
button * {
......
......@@ -39,7 +39,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
font-weight: bold;
display: inline-block;
text-align: center;
flex-shrink: 0;
}
.window header h1 span {
......@@ -51,17 +50,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
.window header > div {
order: -1;
margin-right: auto;
padding: 0 0.3em;
width: 40%;
flex-shrink: 5;
flex-basis: 20%;
flex-grow: 1;
display: flex;
}
.window header > div:first-of-type {
order: 1;
margin: 0;
margin-left: auto;
justify-content: flex-end;
}
text-align: right;
}
\ No newline at end of file
.window header {
button {
margin: 0 0.3em;
}
}
......@@ -42,7 +42,7 @@ button.headerbar_menu::before {
position: relative;
top: 2em;
padding: 0.75em 0;
padding: 0.75em 0;
}
.popover + *.popover {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment