cloudron
/
freshrss-app
mirror of https://git.cloudron.io/cloudron/freshrss-app
1
0
Fork 0
Code Issues Releases Wiki Activity

Removed update menu item

This commit is contained in:
Dennis Schwerdel 2017-02-23 15:54:34 +01:00
parent a3014a0fdb
commit 1175cc0d8f
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile
View File

@ -24,7 +24,7 @@ ADD change-ttrss-file-path.patch /app/code/change-ttrss-file-path.patch
RUN wget https://github.com/FreshRSS/Extensions/archive/${EXTENSIONS_VERSION}.tar.gz -O - \ RUN wget https://github.com/FreshRSS/Extensions/archive/${EXTENSIONS_VERSION}.tar.gz -O - \
| tar -xz --strip-components=1 -C /app/code/extensions \ | tar -xz --strip-components=1 -C /app/code/extensions \
&& patch -p1 -d /app/code/extensions < /app/code/change-ttrss-file-path.patch \ && patch -p0 -d /app/code < /app/code/change-ttrss-file-path.patch \
&& mv /app/code/extensions /app/code/extensions-orig \ && mv /app/code/extensions /app/code/extensions-orig \
&& ln -s /app/data/extensions /app/code/extensions \ && ln -s /app/data/extensions /app/code/extensions \
&& ln -s /app/data/extensions/ttrss.php /app/code/p/api/ttrss.php && ln -s /app/data/extensions/ttrss.php /app/code/p/api/ttrss.php
@ -42,6 +42,9 @@ RUN rm /etc/apache2/sites-enabled/* \
RUN rm -rf /var/lib/php \ RUN rm -rf /var/lib/php \
&& ln -s /run/php /var/lib/php && ln -s /run/php /var/lib/php
ADD remove-update-menu.patch /app/code/remove-update-menu.patch
RUN patch -p0 -d /app/code < /app/code/remove-update-menu.patch
ADD start.sh /app/code/start.sh ADD start.sh /app/code/start.sh
ADD set_config.php /app/code/set_config.php ADD set_config.php /app/code/set_config.php

24
remove-update-menu.patch Normal file
View File

@ -0,0 +1,24 @@
diff -Naru app-orig/layout/aside_configure.phtml app/layout/aside_configure.phtml
--- app-orig/layout/aside_configure.phtml 2016-12-26 15:33:47.000000000 +0000
+++ app/layout/aside_configure.phtml 2017-02-23 14:48:10.214072522 +0000
@@ -41,9 +41,5 @@
Minz_Request::actionName() === 'checkInstall' ? ' active' : ''; ?>">
<a href="<?php echo _url('update', 'checkInstall'); ?>"><?php echo _t('gen.menu.check_install'); ?></a>
</li>
- <li class="item<?php echo Minz_Request::controllerName() === 'update' &&
- Minz_Request::actionName() === 'index' ? ' active' : ''; ?>">
- <a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('gen.menu.update'); ?></a>
- </li>
<?php } ?>
</ul>
diff -Naru app-orig/layout/header.phtml app/layout/header.phtml
--- app-orig/layout/header.phtml 2016-12-26 15:33:47.000000000 +0000
+++ app/layout/header.phtml 2017-02-23 14:48:31.430114487 +0000
@@ -71,7 +71,6 @@
<li class="item"><a href="<?php echo _url('user', 'manage'); ?>"><?php echo _t('gen.menu.user_management'); ?></a></li>
<li class="item"><a href="<?php echo _url('auth', 'index'); ?>"><?php echo _t('gen.menu.authentication'); ?></a></li>
<li class="item"><a href="<?php echo _url('update', 'checkInstall'); ?>"><?php echo _t('gen.menu.check_install'); ?></a></li>
- <li class="item"><a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('gen.menu.update'); ?></a></li>
<?php } ?>
<li class="separator"></li>
<li class="item"><a href="<?php echo _url('stats', 'index'); ?>"><?php echo _t('gen.menu.stats'); ?></a></li>