Commit 155dc277 authored by Henning Leutz's avatar Henning Leutz 🥋

Merge branch 'dev'

parents b14a56e1 d9ad9cbf
......@@ -10,6 +10,30 @@
</thead>
<tbody>
<tr>
<td>
<label class="field-container">
<span class="field-container-item">
{locale
group="quiqqer/quiqqer"
var="projects.project.settings.panel.mediaSettings.imageLibrary"
}
</span>
<select type="checkbox" name="media_image_library" class="field-container-field">
<option value="">
{locale
group="quiqqer/quiqqer"
var="projects.project.settings.panel.mediaSettings.imageLibrary.auto"
}
</option>
<option value="imagick">Image Magick</option>
<option value="gd">GD Lib</option>
</select>
</label>
</td>
</tr>
<tr>
<td>
<label class="field-container">
......
......@@ -64,4 +64,26 @@
line-height: 36px !important;
margin: 0 !important;
width: 40px !important;
}
.quiqqer-project-panel .qui-panel-icon {
display: none;
}
.quiqqer-project-panel h2.qui-panel-title {
padding-left: 10px;
}
.quiqqer-project-panel-button-home {
width: 40px;
}
.quiqqer-project-panel-button-home .image-container {
float: left;
text-align: center;
width: 100%;
}
.quiqqer-project-panel-button-home .image-container span {
float: none;
}
\ No newline at end of file
......@@ -68,7 +68,7 @@ define('controls/projects/project/Panel', [
name : 'projects-panel',
project: false,
lang : false,
icon : 'fa fa-home'
icon : false
});
this.parent(options);
......@@ -79,18 +79,18 @@ define('controls/projects/project/Panel', [
title: Locale.get('quiqqer/system', 'projects.project.panel.title')
});
this.$Map = null;
this.$Map = null;
this.$projectmaps = {};
this.$Filter = null;
this.$Button = null;
this.$Filter = null;
this.$Button = null;
this.$ProjectList = null;
this.$ProjectList = null;
this.$ProjectContainer = null;
this.$ProjectSearch = null;
this.$ProjectContent = null;
this.$ProjectSearch = null;
this.$ProjectContent = null;
this.$LanguageSelect = null;
this.$MediaButton = null;
this.$MediaButton = null;
this.$__fx_run = false;
......@@ -150,6 +150,8 @@ define('controls/projects/project/Panel', [
var self = this,
Content = this.getContent();
this.getElm().addClass('quiqqer-project-panel');
Content.set(
'html',
......@@ -163,9 +165,9 @@ define('controls/projects/project/Panel', [
Content.setStyle('opacity', 0);
this.$ProjectContainer = Content.getElement('.project-container');
this.$ProjectList = Content.getElement('.project-list');
this.$ProjectSearch = Content.getElement('.project-search');
this.$ProjectContent = Content.getElement('.project-content');
this.$ProjectList = Content.getElement('.project-list');
this.$ProjectSearch = Content.getElement('.project-search');
this.$ProjectContent = Content.getElement('.project-content');
this.$ProjectContainer.setStyles({
height: 'calc(100% - 40px)'
......@@ -305,7 +307,7 @@ define('controls/projects/project/Panel', [
// title button
this.$Button = new QUIButton({
name : 'projects',
image : 'fa fa-arrow-circle-left',
icon : 'fa fa-home',
title : Locale.get('quiqqer/system', 'projects.project.panel.projectSelect'),
events: {
onClick: function (Btn, event) {
......@@ -332,6 +334,7 @@ define('controls/projects/project/Panel', [
}
self.createList();
self.open();
}
}
}).inject(this.getHeader(), 'top');
......@@ -339,6 +342,7 @@ define('controls/projects/project/Panel', [
this.$Button.getElm().removeClass('qui-button');
this.$Button.getElm().addClass('button');
this.$Button.getElm().addClass('btn-blue');
this.$Button.getElm().addClass('quiqqer-project-panel-button-home');
},
/**
......@@ -366,24 +370,26 @@ define('controls/projects/project/Panel', [
self.openProject();
self.Loader.hide();
return;
} else if (Object.getLength(result)) {
for (key in result) {
if (!result.hasOwnProperty(key)) {
continue;
}
} else {
if (Object.getLength(result)) {
for (key in result) {
if (!result.hasOwnProperty(key)) {
continue;
}
if (result[key].standard !== "1") {
continue;
}
if (result[key].standard !== "1") {
continue;
self.setAttribute('project', key);
self.setAttribute('lang', result[key].default_lang);
break;
}
self.setAttribute('project', key);
self.setAttribute('lang', result[key].default_lang);
break;
self.openProject();
self.Loader.hide();
return;
}
self.openProject();
self.Loader.hide();
return;
}
// no projects exists
......@@ -676,7 +682,7 @@ define('controls/projects/project/Panel', [
onChildClick : this.$openSitePanel,
onChildContextMenu: function (Item, MapItem, event) {
var title = MapItem.getAttribute('text') + ' - ' +
MapItem.getAttribute('value');
MapItem.getAttribute('value');
MapItem.getContextMenu().setTitle(title).setPosition(
event.page.x,
......
......@@ -5,19 +5,6 @@
* @author www.pcsg.de (Henning Leutz)
* @module controls/upload/File
*
* @require qui/QUI
* @require qui/controls/Control
* @require qui/controls/contextmenu/Menu
* @require qui/controls/contextmenu/Item
* @require qui/controls/buttons/Button
* @require qui/controls/utils/Progressbar
* @require qui/controls/windows/Prompt
* @require qui/controls/messages/Error
* @require qui/utils/Math
* @require qui/utils/Object
* @require Ajax
* @require Locale
*
* @fires onClick [this]
* @fires onCancel [this]
* @fires onComplete [this]
......@@ -169,9 +156,9 @@ define('controls/upload/File', [
this.$Elm = new Element('div', {
html : '<div class="file-name">' + this.getFilename() + '</div>' +
'<div class="upload-time"></div>' +
'<div class="progress"></div>' +
'<div class="buttons"></div>',
'<div class="upload-time"></div>' +
'<div class="progress"></div>' +
'<div class="buttons"></div>',
'class': 'upload-manager-file box smooth'
});
......@@ -200,8 +187,8 @@ define('controls/upload/File', [
Buttons.set({
html : '<form action="" method=""">' +
'<input type="file" name="files" value="upload" />' +
'</form>',
'<input type="file" name="files" value="upload" />' +
'</form>',
styles: {
'float': 'right',
clear : 'both',
......@@ -653,6 +640,11 @@ define('controls/upload/File', [
};
for (var i = 0, len = messages.length; i < len; i++) {
// parse time for javascript date
if ("time" in messages[i]) {
messages[i].time = messages[i] * 1000;
}
MH.parse(messages[i], send);
}
});
......
......@@ -339,6 +339,8 @@ class Queue
return true;
} catch (\Exception $Exception) {
QUI\System\Log::writeException($Exception);
throw new QUI\Exception(
'Mail Error: ' . $Exception->getMessage(),
500
......
......@@ -212,7 +212,20 @@ class Media extends QUI\QDOM
*/
public function getImageManager()
{
if (class_exists('Imagick')) {
$Project = $this->getProject();
$library = $Project->getConfig('media_image_library');
switch ($library) {
case '':
case 'imagick':
case 'gd':
break;
default:
$library = '';
}
if (class_exists('Imagick') && ($library === '' || $library === 'imagick')) {
return new ImageManager(['driver' => 'imagick']);
}
......
......@@ -193,6 +193,12 @@
<locale name="projects.project.settings.panel.favicon">
<de><![CDATA[Favicon]]></de>
</locale>
<locale name="projects.project.settings.panel.mediaSettings.imageLibrary">
<de><![CDATA[Verwendete Bildbibliothek]]></de>
</locale>
<locale name="projects.project.settings.panel.mediaSettings.imageLibrary.auto">
<de><![CDATA[QUIQQER bestimmt welche Bibliothek verwendet wird.]]></de>
</locale>
<locale name="projects.project.settings.panel.mediaSettings.createCacheOnSave">
<de><![CDATA[Bildercache on the Fly erstellen.]]></de>
</locale>
......@@ -2109,7 +2115,7 @@
<de><![CDATA[Der Ordner wurde erfolgreich gespeichert]]></de>
</locale>
<locale name="exception.permission.session.expired">
<de><![CDATA[Ihre Sitzung ist abgelaufen, bitte loggen Sie sich ein.]]></de>
<de><![CDATA[Ihre Sitzung ist abgelaufen, bitte loggen Sie sich erneut ein.]]></de>
</locale>
<locale name="exception.permission.no.admin">
<de><![CDATA[Sie besitzen nicht die nötigen Rechte sich an der Administration anzumelden.]]></de>
......@@ -4316,8 +4322,8 @@
</locale>
<locale name="exception.session.expired.from.other">
<de><![CDATA[
Jemand hat sich auf einem anderen PC mit Ihrem Benutzernamen angemeldet,
Aus diesem Grund wurde Ihre Sitzung beendet. Bitte loggen Sie sich erneut ein.
Jemand hat sich von einem anderen PC aus mit Ihrem Account angemeldet,
aus diesem Grund wurde Ihre Sitzung beendet. Bitte loggen Sie sich erneut ein.
]]></de>
</locale>
<locale name="exception.permissions.exists">
......
......@@ -193,6 +193,12 @@
<locale name="projects.project.settings.panel.favicon">
<en><![CDATA[Favicon]]></en>
</locale>
<locale name="projects.project.settings.panel.mediaSettings.imageLibrary">
<en><![CDATA[Used image library]]></en>
</locale>
<locale name="projects.project.settings.panel.mediaSettings.imageLibrary.auto">
<en><![CDATA[QUIQQER determines which library is used.]]></en>
</locale>
<locale name="projects.project.settings.panel.mediaSettings.createCacheOnSave">
<en><![CDATA[Create image cache on the fly.]]></en>
</locale>
......
......@@ -11,9 +11,8 @@
<td style="padding: 30px 0px 30px 0px;" class="logo">
<table border="0" cellpadding="0" cellspacing="0" width="100%" style="width: 100%;">
<tr>
<td bgcolor="#f8f8f8" width="200" align="left"><a href="http://alistapart.com/article/can-email-be-responsive/" target="_blank">
<td bgcolor="#f8f8f8" width="200" align="left">
<img alt="Logo" src="{image image=$Project->getMedia()->getLogoImage() height=40 onlysrc='true' host=1}" height="40" style="display: block; font-family: Helvetica, Arial, sans-serif; color: #666666; font-size: 16px; max-width: 100%; height: auto;" border="0">
</a>
</td>
<td bgcolor="#f8f8f8" width="300" align="right" class="mobile-hide">
<table border="0" cellpadding="0" cellspacing="0">
......@@ -36,6 +35,7 @@
{template_event name="quiqqer::quiqqer::mail::bodyAfterHeader"}
{if $mailBody}
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td bgcolor="#ffffff" align="center" style="padding: 70px 15px 70px 15px;" class="section-padding">
......@@ -49,5 +49,6 @@
</td>
</tr>
</table>
{/if}
{template_event name="quiqqer::quiqqer::mail::bodyEnd"}
\ No newline at end of file
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