From 18e5206b26facc1863fd1164c7d83b769190d1c8 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Thu, 28 Sep 2017 17:57:46 +0200 Subject: [PATCH] Debian update --- lam-packaging/debian/control | 2 +- lam-packaging/debian/postinst | 6 +- lam-packaging/debian/postrm | 6 +- .../plugins/magicline/dev/magicline.html | 594 ------------------ 4 files changed, 3 insertions(+), 605 deletions(-) delete mode 100644 lam/templates/lib/extra/ckeditor/plugins/magicline/dev/magicline.html diff --git a/lam-packaging/debian/control b/lam-packaging/debian/control index 2127cd6c..de639238 100644 --- a/lam-packaging/debian/control +++ b/lam-packaging/debian/control @@ -2,7 +2,7 @@ Source: ldap-account-manager Maintainer: Roland Gruber Section: web Priority: extra -Standards-Version: 3.9.8 +Standards-Version: 4.1.0 Build-Depends: debhelper (>= 9), po-debconf, cleancss, closure-compiler Homepage: https://www.ldap-account-manager.org/ diff --git a/lam-packaging/debian/postinst b/lam-packaging/debian/postinst index 4eb9ba5e..33d1761b 100755 --- a/lam-packaging/debian/postinst +++ b/lam-packaging/debian/postinst @@ -80,11 +80,7 @@ if [ "$1" = "configure" ]; then if [ "$RET" = "true" ]; then for server in $restart; do server=${server%,} - if [ `which systemctl` ]; then - if [ "`systemctl is-active ${server}.service`" = "active" ]; then - systemctl reload ${server}.service - fi - elif [ `which invoke-rc.d` ]; then + if [ `which invoke-rc.d` ]; then invoke-rc.d $server reload elif [ `which service` ]; then service $server reload diff --git a/lam-packaging/debian/postrm b/lam-packaging/debian/postrm index 39a6ab00..3c12a477 100755 --- a/lam-packaging/debian/postrm +++ b/lam-packaging/debian/postrm @@ -41,11 +41,7 @@ if [ -f /usr/share/debconf/confmodule ]; then set -e for server in $restart; do server=${server%,} - if [ `which systemctl` ]; then - if [ "`systemctl is-active ${server}.service`" = "active" ]; then - systemctl reload ${server}.service - fi - elif [ `which invoke-rc.d` ]; then + if [ `which invoke-rc.d` ]; then invoke-rc.d $server reload elif [ `which service` ]; then service $server reload diff --git a/lam/templates/lib/extra/ckeditor/plugins/magicline/dev/magicline.html b/lam/templates/lib/extra/ckeditor/plugins/magicline/dev/magicline.html deleted file mode 100644 index 26c34a4d..00000000 --- a/lam/templates/lib/extra/ckeditor/plugins/magicline/dev/magicline.html +++ /dev/null @@ -1,594 +0,0 @@ - - - - - - Magicline muddy trenches – CKEditor Sample - - - - - -

- CKEditor Sample — magicline muddy trenches -

- -

Various cases

- - -

Odd case: first (last) element at the very beginning, short editable

- - -

Large document, put everywhere

- - -

Deeply nested divs

- - -

Line custom look

-
-

- Little Red Riding Hood

-

- "Little Red Riding Hood" is a famous fairy tale about a young girl's encounter with a wolf. The story has been changed considerably in its history and subject to numerous modern adaptations and readings.

- - - - - - - - - - - - - - - - -
- International Names
- Chinese - 小紅帽
- Italian - Cappuccetto Rosso
- Spanish - Caperucita Roja
-
-
-

- The version most widely known today is based on the Brothers Grimm variant. It is about a girl called Little Red Riding Hood, after the red hooded cape or cloak she wears. The girl walks through the woods to deliver food to her sick grandmother.

-

- A wolf wants to eat the girl but is afraid to do so in public. He approaches the girl, and she naïvely tells him where she is going. He suggests the girl pick some flowers, which she does. In the meantime, he goes to the grandmother's house and gains entry by pretending to be the girl. He swallows the grandmother whole, and waits for the girl, disguised as the grandmother.

-

- When the girl arrives, she notices he looks very strange to be her grandma. In most retellings, this eventually culminates with Little Red Riding Hood saying, "My, what big teeth you have!"
- To which the wolf replies, "The better to eat you with," and swallows her whole, too.

-

- A hunter, however, comes to the rescue and cuts the wolf open. Little Red Riding Hood and her grandmother emerge unharmed. They fill the wolf's body with heavy stones, which drown him when he falls into a well. Other versions of the story have had the grandmother shut in the closet instead of eaten, and some have Little Red Riding Hood saved by the hunter as the wolf advances on her rather than after she is eaten.

-

- The tale makes the clearest contrast between the safe world of the village and the dangers of the forest, conventional antitheses that are essentially medieval, though no written versions are as old as that.

-
- -

Extreme inline editing

-
-
Lorem ipsum dolor sit amet enim. Etiam ullamcorper. Suspendisse a pellentesque dui, non felis. Maecenas malesuada elit lectus felis, malesuada ultricies. Curabitur et ligula. Ut molestie a, ultricies porta urna. Vestibulum commodo volutpat a, convallis ac, laoreet enim.
-
- Position static -
foo
-
-
-
Key
Value
-
-
Whatever
-
-

Lorem ipsum dolor sit amet enim. Etiam ullamcorper. Suspendisse a pellentesque dui, non felis. Maecenas malesuada elit lectus felis, malesuada ultricies

-
-
-

Lorem ipsum dolor sit amet enim. Etiam ullamcorper. Suspendisse a pellentesque dui, non felis. Maecenas malesuada elit lectus felis, malesuada ultricies

-
foo
-
- -

Enter mode: BR

- - -
-

- Mouse over: - Mouse Y-pos.: -

-

- - - - - -

Time:

-

Hidden state:

-
- - -