moparisthebest/wallabag
1
0
Fork 0
mirror of https://github.com/moparisthebest/wallabag synced 2024-11-30 12:52:24 -05:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into dev

Browse Source
This commit is contained in:
Maryana Rozhankivska 2014-02-20 11:42:18 +02:00
commit 6203ef8e51
5 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
install/index.php
View File

@ -172,7 +172,7 @@ else if ($_POST['install']) {
<li><a href="http://www.wallabag.org/">wallabag.org</a></li> <li><a href="http://www.wallabag.org/">wallabag.org</a></li>
</ul> </ul>
<?php if (!empty($errors)) : ?> <?php if (!empty($errors)) : ?>
<div class='install messages error'> <div class='messages error install'>
<p>Errors during installation:</p> <p>Errors during installation:</p>
<p> <p>
<ul> <ul>
@ -185,7 +185,7 @@ else if ($_POST['install']) {
</div> </div>
<?php endif; ?> <?php endif; ?>
<?php if (!empty($successes)) : ?> <?php if (!empty($successes)) : ?>
<div class='install messages success'> <div class='messages success install'>
<p> <p>
<ul> <ul>
<?php foreach($successes as $success) :?> <?php foreach($successes as $success) :?>
@ -194,6 +194,14 @@ else if ($_POST['install']) {
</ul> </ul>
</p> </p>
</div> </div>
<?php else : ?>
<?php if (file_exists('inc/poche/config.inc.php') && is_dir('vendor')) : ?>
<div class='messages success install'>
<p>
wallabag seems already installed. If you want to update it, you only have to delete install folder.
</p>
</div>
<?php endif; ?>
<?php endif; ?> <?php endif; ?>
<p>To install wallabag, you just have to fill the following fields. That's all.</p> <p>To install wallabag, you just have to fill the following fields. That's all.</p>
<p>Don't forget to check your server compatibility <a href="wallabag_compatibility_test.php">here</a>.</p> <p>Don't forget to check your server compatibility <a href="wallabag_compatibility_test.php">here</a>.</p>
@ -201,7 +209,7 @@ else if ($_POST['install']) {
<fieldset> <fieldset>
<legend><strong>Technical settings</strong></legend> <legend><strong>Technical settings</strong></legend>
<?php if (!is_dir('vendor')) : ?> <?php if (!is_dir('vendor')) : ?>
<div class='install messages notice'>wallabag needs twig, a template engine (<a href="http://twig.sensiolabs.org/">?</a>). Two ways to install it: <div class='messages notice install'>wallabag needs twig, a template engine (<a href="http://twig.sensiolabs.org/">?</a>). Two ways to install it:
<ul> <ul>
<li>automatically download and extract vendor.zip into your wallabag folder. <li>automatically download and extract vendor.zip into your wallabag folder.
<p><input type="submit" name="download" value="Download vendor.zip" /></p> <p><input type="submit" name="download" value="Download vendor.zip" /></p>

1
themes/baggy/_head.twig
View File

@ -2,7 +2,6 @@
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-144x144-precomposed.png"> <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-144x144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-72x72-precomposed.png"> <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-72x72-precomposed.png">
<link rel="apple-touch-icon-precomposed" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-precomposed.png"> <link rel="apple-touch-icon-precomposed" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-precomposed.png">
<link href='http://fonts.googleapis.com/css?family=PT+Sans:700' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/ratatouille.css" media="all"> <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/ratatouille.css" media="all">
<link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/font.css" media="all"> <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/font.css" media="all">
<link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/main.css" media="all"> <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/main.css" media="all">

6
themes/baggy/css/font.css
View File

@ -0,0 +1,6 @@
@font-face {
font-family: 'PT Sans';
font-style: normal;
font-weight: 700;
src: local('PT Sans Bold'), local('PTSans-Bold'), url(/themes/baggy/fonts/ptsans.woff) format('woff');
}

8
themes/baggy/css/messages.css
View File

@ -1,19 +1,19 @@
.install .messages.error { .messages.error.install {
border: 1px solid #c42608; border: 1px solid #c42608;
color: #c00 !important; color: #c00 !important;
background: #fff0ef; background: #fff0ef;
text-align: left; text-align: left;
} }
.install .messages.notice { .messages.notice.install {
border: 1px solid #ebcd41; border: 1px solid #ebcd41;
color: #000; color: #000;
background: #fffcd3; background: #fffcd3;
text-align: left; text-align: left;
} }
.install .messages.success { .messages.success.install {
border: 1px solid #6dc70c; border: 1px solid #6dc70c;
background: #e0fbcc; background: #e0fbcc !important;
text-align: left; text-align: left;
} }

BIN
themes/baggy/font/ptsans.woff Normal file
View File

Binary file not shown.