amal/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merge from sanghee

Browse source 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
This commit is contained in:
Nico Schottelius 2015-08-27 18:21:15 +02:00
commit 59ef61dfe8
2 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
digitalglarus/static/digitalglarus/img/img_2.jpg
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 235 KiB

After

Width:  |  Height:  |  Size: 220 KiB

Before After
Before After

5
hosting/templates/hosting/rails.html
View file

@ -1,14 +1,11 @@
{% extends "hosting/base.html" %} {% extends "hosting/base.html" %}
{% load staticfiles %} {% load staticfiles %}
{%block customcss %}
<link href="{% static 'hosting/css/railshosting.css' %}" rel="stylesheet">
{%endblock%}
{%block specification %} {%block specification %}
<li><i class="fa-li fa fa-check-square-o fa-lg"></i> <li><i class="fa-li fa fa-check-square-o fa-lg"></i>
<p class="lead">Ubuntu 14.04 as the operating system, full root access!</p> <p class="lead">Ubuntu 14.04 as the operating system, full root access!</p>
</li> </li>
<li><i class="fa-li fa fa-check-square-o fa-lg"></i><p class="lead">rbenv to let you decide which Ruby version you want to use</p></li>s
<li><i class="fa-li fa fa-check-square-o fa-lg"></i><p class="lead">nginx as the frontend Server (optional with SSL Support)</p></li> <li><i class="fa-li fa fa-check-square-o fa-lg"></i><p class="lead">nginx as the frontend Server (optional with SSL Support)</p></li>
<li><i class="fa-li fa fa-check-square-o fa-lg"></i><p class="lead">uwsgi to have your application talk to nginx and vice versa <li><i class="fa-li fa fa-check-square-o fa-lg"></i><p class="lead">uwsgi to have your application talk to nginx and vice versa
<li><i class="fa-li fa fa-check-square-o fa-lg"></i><p class="lead">PostgreSQL as the database</p> <li><i class="fa-li fa fa-check-square-o fa-lg"></i><p class="lead">PostgreSQL as the database</p>