Merge remote-tracking branch 'refs/remotes/upstream/master'

Conflicts:
	app/Locale/de_DE/translations.php

5 files changed, 6 insertions, 32 deletions

diff --git a/app/Template/project/duplicate.php b/app/Template/project/duplicate.php
index 8967c306..ca7d3302 100644
--- a/app/Template/project/duplicate.php
+++ b/app/Template/project/duplicate.php
@@ -10,13 +10,17 @@
 
         <?= $this->form->csrf() ?>
 
+        <?php if ($project['is_private'] == 0): ?>
+            <?= $this->form->checkbox('projectPermission', t('Permissions'), 1, true) ?>
+        <?php endif ?>
+
         <?= $this->form->checkbox('category', t('Categories'), 1, true) ?>
         <?= $this->form->checkbox('action', t('Actions'), 1, true) ?>
         <?= $this->form->checkbox('swimlane', t('Swimlanes'), 1, false) ?>
         <?= $this->form->checkbox('task', t('Tasks'), 1, false) ?>
 
         <div class="form-actions">
-            <input type="submit" value="<?= t('Duplicate') ?>" class="btn btn-red"/>
+            <input type="submit" value="<?= t('Duplicate') ?>" class="btn btn-red">
             <?= t('or') ?> <?= $this->url->link(t('cancel'), 'project', 'show', array('project_id' => $project['id'])) ?>
         </div>
     </form>
diff --git a/app/Template/project/index.php b/app/Template/project/index.php
index 3d2a33ea..c5dd267c 100644
--- a/app/Template/project/index.php
+++ b/app/Template/project/index.php
@@ -1,10 +1,6 @@
 <section id="main">
     <div class="page-header">
         <ul>
-            <?php if ($this->user->hasAccess('project', 'create')): ?>
-                <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New project'), 'project', 'create') ?></li>
-            <?php endif ?>
-            <li><i class="fa fa-lock fa-fw"></i><?= $this->url->link(t('New private project'), 'project', 'createPrivate') ?></li>
             <?php if ($this->user->hasAccess('projectuser', 'managers')): ?>
                 <li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('Users overview'), 'projectuser', 'managers') ?></li>
             <?php endif ?>
diff --git a/app/Template/project/layout.php b/app/Template/project/layout.php
index 8ba92ef9..eb391ae5 100644
--- a/app/Template/project/layout.php
+++ b/app/Template/project/layout.php
@@ -30,7 +30,7 @@
         <?= $this->render($sidebar_template, array('project' => $project)) ?>
 
         <div class="sidebar-content">
-            <?= $project_content_for_layout ?>
+            <?= $content_for_sublayout ?>
         </div>
     </section>
 </section>
\ No newline at end of file
diff --git a/app/Template/project/new.php b/app/Template/project/new.php
deleted file mode 100644
index 8e4ccfec..00000000
--- a/app/Template/project/new.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<section id="main">
-    <div class="page-header">
-        <ul>
-            <li><i class="fa fa-folder fa-fw"></i><?= $this->url->link(t('All projects'), 'project', 'index') ?></li>
-        </ul>
-    </div>
-    <form method="post" action="<?= $this->url->href('project', 'save') ?>" autocomplete="off">
-
-        <?= $this->form->csrf() ?>
-        <?= $this->form->hidden('is_private', $values) ?>
-        <?= $this->form->label(t('Name'), 'name') ?>
-        <?= $this->form->text('name', $values, $errors, array('autofocus', 'required', 'maxlength="50"')) ?>
-
-        <div class="form-actions">
-            <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
-            <?= t('or') ?> <?= $this->url->link(t('cancel'), 'project', 'index') ?>
-        </div>
-    </form>
-    <?php if (isset($is_private) && $is_private): ?>
-    <div class="alert alert-info">
-        <p><?= t('There is no user management for private projects.') ?></p>
-    </div>
-    <?php endif ?>
-</section>
\ No newline at end of file
diff --git a/app/Template/project/sidebar.php b/app/Template/project/sidebar.php
index 2f2ce3ce..304b4aee 100644
--- a/app/Template/project/sidebar.php
+++ b/app/Template/project/sidebar.php
@@ -63,6 +63,4 @@
 
         <?= $this->hook->render('template:project:sidebar', array('project' => $project)) ?>
     </ul>
-    <div class="sidebar-collapse"><a href="#" title="<?= t('Hide sidebar') ?>"><i class="fa fa-chevron-left"></i></a></div>
-    <div class="sidebar-expand" style="display: none"><a href="#" title="<?= t('Expand sidebar') ?>"><i class="fa fa-chevron-right"></i></a></div>
 </div>