no need to create symlink to pip

pull/989/head
Piero Toffanin 2021-05-26 12:18:33 -04:00
rodzic 30ae36d91e
commit b05cceaa04
5 zmienionych plików z 28 dodań i 2 usunięć

Wyświetl plik

@ -20,7 +20,6 @@ RUN apt-get -qq update && apt-get -qq install -y nodejs
# Install Python3, GDAL, nginx, letsencrypt, psql
RUN apt-get -qq update && apt-get -qq install -y --no-install-recommends python3 python3-pip python3-setuptools python3-wheel git g++ python3-dev python2.7-dev libpq-dev binutils libproj-dev gdal-bin python3-gdal nginx certbot grass-core gettext-base cron postgresql-client-12 gettext
RUN update-alternatives --install /usr/bin/python python /usr/bin/python2.7 1 && update-alternatives --install /usr/bin/python python /usr/bin/python3.8 2
RUN ln -s /usr/bin/pip3 /usr/bin/pip && pip install -U pip
# Install pip reqs
ADD requirements.txt /webodm/

Wyświetl plik

@ -84,6 +84,10 @@ html, body, section.main, .content, #wrapper, #page-wrapper{
}
}
.sidebar-nav.navbar-collapse{
width: 100%;
}
.navbar-top-links li a.dropdown-toggle{
height: 50px;
}

Wyświetl plik

@ -55,6 +55,18 @@
<link rel="stylesheet" type="text/x-scss" href="{% static 'app/css/theme.scss' %}" />
{% endcompress %}
{% is_desktop_mode as desktop_mode %}
{% if desktop_mode %}
<!-- Hide top nav bar -->
<style type="text/css">
.navbar-header { display: none; }
#navbar-top .navbar-default.sidebar{ top: 0; position: fixed; }
#navbar-top { height: 0; min-height: 0; }
.map-view { height: calc(100% + 30px) !important; }
.model-view { height: calc(100% + 50px) !important; }
</style>
{% endif %}
<style type="text/css">
{{ SETTINGS.theme.css|safe }}
</style>
@ -97,11 +109,18 @@ $(function(){
$('#side-menu').metisMenu();
$(window).bind("load resize", function() {
{% if desktop_mode %}
var topOffset = 0;
{% else %}
var topOffset = 50;
{% endif %}
var width = (this.window.innerWidth > 0) ? this.window.innerWidth : this.screen.width;
if (width < 768) {
$('div.navbar-collapse').addClass('collapse');
{% if not desktop_mode %}
topOffset = 100; // 2-row-menu
{% endif %}
} else {
$('div.navbar-collapse').removeClass('collapse');
}

Wyświetl plik

@ -11,6 +11,10 @@ logger = logging.getLogger('app.logger')
def is_single_user_mode():
return settings.SINGLE_USER_MODE
@register.simple_tag
def is_desktop_mode():
return settings.DESKTOP_MODE
@register.simple_tag
def is_dev_mode():
return settings.DEV

Wyświetl plik

@ -71,7 +71,7 @@ PROCESSING_NODES_ONBOARDING = None
# Enable desktop mode. In desktop mode some styling changes
# are applied to make the application look nicer on desktop
# as well as disabling certain features (e.g. sharing)
DESKTOP_MODE = False
DESKTOP_MODE = True
# Default CSS to add to theme
DEFAULT_THEME_CSS = ''