diff options
| -rw-r--r-- | README.md | 10 | ||||
| -rw-r--r-- | admin_site_readme.php | 42 | ||||
| -rw-r--r-- | themes/_administration/css-1.5.2/style.css | 21 |
3 files changed, 26 insertions, 47 deletions
@@ -1,9 +1,9 @@ Copyright (C) 2013 webtrees Development Team. All rights reserved. -This and other information can be found on line at http://webtrees.net +This and other information can be found on line at [http://webtrees.net](http://webtrees.net) The installation instructions can also be found in the wiki at: -http://webtrees.net/mediawiki/index.php/Main_Page +[http://webtrees.net/mediawiki/index.php/Main_Page](http://webtrees.net/mediawiki/index.php/Main_Page) # webtrees @@ -396,7 +396,7 @@ The requirements are: if desired. #### Warning -Please read the http://wiki.webtrees.net/en/Converting_from_PhpGedView +Please read the [http://wiki.webtrees.net/en/Converting_from_PhpGedView](http://wiki.webtrees.net/en/Converting_from_PhpGedView) before doing a transfer as important pre-processing steps and known issues may be outlined there. @@ -417,8 +417,8 @@ FAQs, and HTML blocks. We hope to add these to the wizard in a future release. #### Custom privacy restrictions, block configuration, FAQs and HTML blocks We hope to add these to the wizard in a future release. Otherwise, read the -http://wiki.webtrees.net/en/Converting_from_PhpGedView before reporting a problem -in the forum. +[http://wiki.webtrees.net/en/Converting_from_PhpGedView](http://wiki.webtrees.net/en/Converting_from_PhpGedView) +before reporting a problem in the forum. The transfer wizard is accessed in **webtrees** from the bottom of the "Manage family trees" page to which you will be automatically directed once you diff --git a/admin_site_readme.php b/admin_site_readme.php index fc205d8f8b..dad7522549 100644 --- a/admin_site_readme.php +++ b/admin_site_readme.php @@ -19,41 +19,23 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA define('WT_SCRIPT_NAME', 'admin_site_readme.php'); + require './includes/session.php'; -$controller=new WT_Controller_Page(); +$controller = new WT_Controller_Page(); $controller ->requireAdminLogin() ->setPageTitle(WT_I18N::translate('README documentation')) ->pageHeader(); -function get_tag($txt,$tag){ - $offset = 0; - $start_tag = "<".$tag; - $end_tag = "</".$tag.">"; - $arr = array(); - do{ - $pos = strpos($txt,$start_tag,$offset); - if($pos){ - $str_pos = strpos($txt,">",$pos)+1; - $end_pos = strpos($txt,$end_tag,$str_pos); - $len = $end_pos - $str_pos; - $f_text = substr($txt,$str_pos,$len); - $arr[] = $f_text; - $offset = $end_pos; - } - }while($pos); - return $arr; -} - -echo '<div id="readme" dir="ltr" lang="en">'; // This information is always LTR/English - -$url = 'readme.html'; -$txt = file_get_contents($url); -$arr = get_tag($txt, "body"); - -foreach ($arr as $value) { - echo $value; -} +// This information is always LTR/English +?> +<div class="markdown" dir="ltr" lang="en"> + <?php + use \Michelf\MarkdownExtra; -echo '</div>'; + echo MarkdownExtra::defaultTransform( + file_get_contents('README.md') + ); + ?> +</div>
\ No newline at end of file diff --git a/themes/_administration/css-1.5.2/style.css b/themes/_administration/css-1.5.2/style.css index 4b2ade52b5..63b06139ac 100644 --- a/themes/_administration/css-1.5.2/style.css +++ b/themes/_administration/css-1.5.2/style.css @@ -105,7 +105,7 @@ html[dir=rtl] #links {left:auto; right:10px;} #links li ul {display:none; position:absolute; left:0; top:1.2em; background:url("../jquery-ui-1.10.3/images/ui-bg_fine-grain_10_eceadf_60x60.png") repeat scroll 50% 50% #eceadf; border:1px solid #d9d6c4;z-index:999;} html[dir=rtl] #links li ul {left:auto; right:0;} #links li ul li {display:block; padding:0 5px; text-align:left;} - html[dir=rtl] #links li ul li {text-align:right;} +html[dir=rtl] #links li ul li {text-align:right;} #links, #links li ul {list-style:none; margin:0; padding:1px;} #links li:hover > ul {display:block;} .ui-widget-content a.lang-active {color:#008000;} @@ -174,17 +174,14 @@ input.log-filter {width:120px;} table#log_list {width:100%} #log_list th {min-width:80px;white-space:nowrap;} #log_list pre {margin:0 0 20px 0;max-width:250px;white-space:pre-wrap;word-wrap: break-word;-ms-word-break: break-all;word-break: break-all;-webkit-hyphens: auto;-moz-hyphens: auto; hyphens: auto;} - #log_list a {color:#0000ff;} - #log_list a:hover, #log_list a:visited {color:#ff0000;} +#log_list a {color:#0000ff;} +#log_list a:hover, #log_list a:visited {color:#ff0000;} -/* README */ -#readme {font-size:12px; padding:10px 20px;} -#readme h1 {font-size:16px; font-weight:bold; margin-top:0;} -#readme h2 {font-size:14px; font-weight:bold; margin-top:0;} -#readme h3 {font-size:14px; font-weight:bold; margin:14px 0;} -#readme li {line-height:150%;} -#readme .back {float:right;} -html[dir=rtl] #readme .back {float:left;} + +/* Markdown */ +.markdown a { + color: blue; +} /* PHP INFO */ div.php_info {padding:10px; text-align:center; width:100%;} @@ -308,7 +305,7 @@ input:required:invalid, textarea:required:invalid {background-image:url(data:ima html[dir=rtl] input:required:valid, html[dir=rtl] textarea:required:valid, html[dir=rtl] input:required:invalid, html[dir=rtl] textarea:required:invalid {background-position:left top;} /* BROADCAST MESSAGES */ - /* no styles used */ +/* no styles used */ /* USER CLEAN */ table#clean {background:#fdf5e6; border:1px inset #d9d6c4; border-collapse:separate; border-spacing:0; padding:5px;} |