Skip to content

Commit

Permalink
Merge branch '10-update-php-add-aeon-integration-js' into 'bmac'
Browse files Browse the repository at this point in the history
Resolve "Update PHP, add aeon integration js"

Closes #10

See merge request ugalibs/collective-access-public-interface!10
  • Loading branch information
kco-uga committed Jun 16, 2022
2 parents af337b2 + 6a64de8 commit c6eac9c
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ENV PATH /app/apache2/bin:$PATH
RUN sed -i "s/\/snap\/bin/\/snap\/bin:\/app\/apache2\/bin/" /etc/sudoers

#PHP
ARG PHP_VERSION=7.4.29
ARG PHP_VERSION=7.4.30
RUN apt-get -qq install libcurl4-gnutls-dev pkg-config libpng-dev libonig-dev libsqlite3-dev libxml2-dev libzip-dev libmemcached-dev memcached && wget https://www.php.net/distributions/php-$PHP_VERSION.tar.gz && tar xzf php-$PHP_VERSION.tar.gz && cd php-$PHP_VERSION && './configure' '--prefix=/usr/local' '--with-apxs2=/app/apache2/bin/apxs' '--with-mysqli' '--enable-mbstring' '--with-pdo-mysql' '--with-openssl' '--with-zlib' '--enable-gd' '--enable-opcache' '--with-curl' '--enable-exif' '--with-zip' && make -j$(nproc) && make install && cp php.ini-production /usr/local/lib/php.ini && cd .. && rm -rf php-$PHP_VERSION*

RUN apt-get -qq install autoconf && wget https://pecl.php.net/get/memcached-3.1.5.tgz && tar xzf memcached-3.1.5.tgz && cd memcached-3.1.5 && phpize && ./configure && make && make install && echo "extension=memcached.so" >> /usr/local/lib/php.ini && cd .. && rm -rf memcached-3.1.5*
Expand Down
14 changes: 14 additions & 0 deletions assets/aeon/aeonRequestsDialog.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
.ui-dialog .ui-dialog-titlebar{text-align:left}
.aeon_request {font-size: .8em; text-align: left}
.aeon_request .label { font-weight: bold; }
.aeon_request .requestDesc { margin-left: 2em; }
.aeon_request_header, .aeon_request .select_all_buttons,.aeon_request .requestItem, .aeon_request .notes, .aeon_request .scheduled_date, .aeon_request .review, .aeon_request .buttons, .aeon_request .simple_copy_opt, .aeon_request .advanced_copy_opt, .aeon_request .aeon_request_items{ margin-bottom: 1em; }
.aeon_request .request_inputs { float:left; }
.aeon_request .rev_sched_opt { float:left; clear:left; margin-right: 1em; height: 3em; }
.aeon_request .buttons { clear:both; }
.aeon_request .disabled { color: #aaa; }
.aeon_request .advanced_copy_opt .label { display: inline-block; width: 14em;}
.aeon_request .adv_copy_select { width: 20em;}
.aeon_request .message { font-weight: bold; margin-bottom: .2em; }
.aeon_request .select_all, .aeon_request .dialog_submit { margin-right: .5em; }
.aeon_request .aeon_request_items { max-height: 500px; overflow-y: auto; }
33 changes: 33 additions & 0 deletions assets/aeon/aeonRequestsDialog.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c6eac9c

Please sign in to comment.