Merge branch 'master' into grunt

This commit is contained in:
Ben Word
2013-05-01 18:02:00 -05:00
22 changed files with 560 additions and 910 deletions

View File

@@ -1,4 +1,9 @@
### HEAD
### 6.4.0: May 1st, 2013
* Fix Theme Activation page issues
* Fix issues with root relative URLs and rewrites on non-standard setups
* Make sure rewrites are added to .htaccess immediately after activation
* Move HTML5 Boilerplate's .htaccess to a [plugin](https://github.com/retlehs/wp-h5bp-htaccess)
* Rename page-custom.php to template-custom.php
* Don't warn about unwritable htaccess if that option is disabled
* Add missing collapse class for top navbar
* Add comment template

View File

@@ -27,7 +27,7 @@ Take a look at the [documentation table of contents](doc/TOC.md).
## Features
* HTML5 Boilerplates markup and `.htaccess`
* HTML5 Boilerplates markup
* Bootstrap from Twitter
* [Theme wrapper](doc/wrapper.md)
* Root relative URLs

View File

@@ -29,23 +29,7 @@ If you don't want to use one of the features, either comment out the line or rem
#### Define which pages shouldn't have the sidebar
`roots_display_sidebar()` is used to define which pages shouldn't get the sidebar. By default, the 404, front `front-page.php` and `page-custom.php` templates are full width. If you would like to remove the sidebar from additional pages, add in the appropriate conditional or page template name.
### h5bp-htaccess
This file contains HTML5 Boilerplate's `.htaccess` which is automatically added by `htaccess.php` if enabled in `config.php`. There are a few changes to the H5BP version:
* Added block to access WordPress files that reveal version information (`wp-config.php`, `readme.html`, `license.txt`)
* Commented out expires headers (we recommend the use of [W3 Total Cache](http://wordpress.org/extend/plugins/w3-total-cache/))
* Commented out ETag removal (we recommend the use of [W3 Total Cache](http://wordpress.org/extend/plugins/w3-total-cache/))
* Commented out start rewrite engine (handled by WordPress)
* Commented out suppress/force www (handled by WordPress)
* Commented out `Options -MultiViews` (causes a server 500 error on most shared hosts)
* Commented out custom 404 page (handled by WordPress)
### htaccess.php
This file handles the HTML5 Boilerplate `.htaccess`.
`roots_display_sidebar()` is used to define which pages shouldn't get the sidebar. By default, the 404, front `front-page.php` and `template-custom.php` templates are full width. If you would like to remove the sidebar from additional pages, add in the appropriate conditional or page template name.
### init.php

View File

@@ -12,8 +12,6 @@ Rewrite:
3. `/wp-content/themes/themename/assets/img/` to `/assets/img/`
4. `/wp-content/plugins/` -> `/plugins/`
If HTML5 Boilerplate's `.htaccess` support is enabled in `lib/config.php`, then the `generate_rewrite_rules()` filter is used to automatically add the contents of `lib/h5bp-htaccess` to your `.htaccess` file.
## Alternative server configurations
### Nginx

View File

@@ -38,8 +38,6 @@ A basic Roots theme initially looks like this:
│ ├── cleanup.php
│ ├── config.php
│ ├── custom.php
│ ├── h5bp-htaccess
│ ├── htaccess.php
│ ├── init.php
│ ├── nav.php
│ ├── rewrites.php
@@ -65,10 +63,10 @@ A basic Roots theme initially looks like this:
├── functions.php
├── index.php
├── page.php
├── page-custom.php
├── screenshot.png
├── single.php
── style.css
── style.css
└── template-custom.php
```
What follows is a general overview of each major part and how to use them.
@@ -128,10 +126,6 @@ This file is used to serve all of the archive templates.
This file is used to serve the page template.
### page-custom.php
An example of a custom page template. By default, this page is full width and doesn't contain a sidebar as defined in `lib/config.php`'s `roots_sidebar()` function.
### single.php
This file is used to serve the single post template.
@@ -139,3 +133,7 @@ This file is used to serve the single post template.
### style.css
This file is used to tell WordPress that we're a theme. None of the actual CSS is contained in this file.
### template-custom.php
An example of a custom page template. By default, this page is full width and doesn't contain a sidebar as defined in `lib/config.php`'s `roots_sidebar()` function.

View File

@@ -11,7 +11,6 @@ require_once locate_template('/lib/cleanup.php'); // Cleanup
require_once locate_template('/lib/nav.php'); // Custom nav modifications
require_once locate_template('/lib/comments.php'); // Custom comments modifications
require_once locate_template('/lib/rewrites.php'); // URL rewriting for assets
require_once locate_template('/lib/htaccess.php'); // HTML5 Boilerplate .htaccess
require_once locate_template('/lib/widgets.php'); // Sidebars and widgets
require_once locate_template('/lib/scripts.php'); // Scripts and stylesheets
require_once locate_template('/lib/custom.php'); // Custom functions

BIN
lang/ms_MY.mo Normal file

Binary file not shown.

328
lang/ms_MY.po Normal file
View File

@@ -0,0 +1,328 @@
msgid ""
msgstr ""
"Project-Id-Version: Roots Bahasa Melayu\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-08-28 11:22-0300\n"
"PO-Revision-Date: 2013-04-11 15:23+0800\n"
"Last-Translator: Hariadi Hinta <diperakui@gmail.com>\n"
"Language-Team: Hariadi Hinta <diperakui@gmail.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-KeywordsList: _;gettext;gettext_noop;__;_e\n"
"X-Poedit-Basepath: ../\n"
"X-Generator: Poedit 1.5.4\n"
"Language: Bahasa Melayu\n"
"X-Poedit-SearchPath-0: .\n"
"X-Poedit-SearchPath-1: ./templates\n"
"X-Poedit-SearchPath-2: ./lib\n"
#: 404.php:5
msgid ""
"The page you are looking for might have been removed, had its name changed, "
"or is temporarily unavailable."
msgstr ""
"Halaman yang anda cari mungkin telah dipindahkan, ditukar nama, atau tidak "
"dapat diakses untuk sementara."
#: 404.php:8
msgid "Please try the following:"
msgstr "Sila cuba yang berikut:"
#: 404.php:10
msgid "Check your spelling"
msgstr "Semak ejaan anda"
#: 404.php:11
#, php-format
msgid "Return to the <a href=\"%s\">home page</a>"
msgstr "Kembali ke <a href=\"%s\">Halaman Utama</a>"
#: 404.php:12
msgid "Click the <a href=\"javascript:history.back()\">Back</a> button"
msgstr "Klik pautan <a href=\"javascript:history.back()\">Kembali</a>"
#: functions.php:28
msgid "Primary Navigation"
msgstr "Menu Utama"
#: lib/activation.php:32 lib/activation.php:33
msgid "Theme Activation"
msgstr "Pengaktifan tema"
#: lib/activation.php:72
#, php-format
msgid "%s Theme Activation"
msgstr "%s Pengaktifan tema"
#: lib/activation.php:87 lib/activation.php:89
msgid "Create static front page?"
msgstr "Buat halaman depan statik?"
#: lib/activation.php:91 lib/activation.php:104 lib/activation.php:117
#: lib/activation.php:130 lib/activation.php:143
msgid "Yes"
msgstr "Ya"
#: lib/activation.php:92 lib/activation.php:105 lib/activation.php:118
#: lib/activation.php:131 lib/activation.php:144
msgid "No"
msgstr "Tidak"
#: lib/activation.php:95
msgid "Create a page called Home and set it to be the static front page"
msgstr ""
"Buat halaman dengan tajuk Home dan tetapkan ianya sebagai halaman depan "
"statik"
#: lib/activation.php:100
msgid "Change permalink structure?"
msgstr "Ubah struktur permalink?"
#: lib/activation.php:102
msgid "Update permalink structure?"
msgstr "Kemaskini struktur permalink?"
#: lib/activation.php:108
msgid "Change permalink structure to /&#37;postname&#37;/"
msgstr "Tukar struktur permalink menjadi /&#37;postname&#37;/"
#: lib/activation.php:113
msgid "Change uploads folder?"
msgstr "Tukar folder muat naik?"
#: lib/activation.php:115
msgid "Update uploads folder?"
msgstr "Kemaskini folder muat naik?"
#: lib/activation.php:121
msgid "Change uploads folder to /assets/ instead of /wp-content/uploads/"
msgstr "Tukar folder muat naik ke /assets/ berbanding /wp-content/uploads/"
#: lib/activation.php:126 lib/activation.php:128
msgid "Create navigation menu?"
msgstr "Buat menu navigasi?"
#: lib/activation.php:134
msgid "Create the Primary Navigation menu and set the location"
msgstr "Buat Menu Navigasi Utama dan tentukan lokasinya"
#: lib/activation.php:139 lib/activation.php:141
msgid "Add pages to menu?"
msgstr "Tambah halaman ke menu?"
#: lib/activation.php:147
msgid "Add all current published pages to the Primary Navigation"
msgstr "Tambah semua halaman yang sudah diterbitkan ke Menu Utama"
#: lib/cleanup.php:404
msgid "Continued"
msgstr "Teruskan"
#: lib/htaccess.php:26
#, php-format
msgid "Please make sure your <a href=\"%s\">.htaccess</a> file is writable "
msgstr ""
"Sila pastikan <a href=\"%s\">.htaccess</a> anda berkeupayaan untuk ditulis"
#: lib/template-tags.php:5
#, php-format
msgid "Posted on %s at %s."
msgstr "Diterbitkan pada %s %s"
#: lib/template-tags.php:6
msgid "Written by"
msgstr "Ditulis oleh"
#: lib/widgets.php:6
msgid "Primary Sidebar"
msgstr "Sidebar Utama"
#: lib/widgets.php:14
msgid "Footer"
msgstr "Footer"
#: lib/widgets.php:30
msgid "Use this widget to add a vCard"
msgstr "Gunakan widget ini untuk menambah vCard"
#: lib/widgets.php:31
msgid "Roots: vCard"
msgstr "Roots: vCard"
#: lib/widgets.php:58
msgid "vCard"
msgstr "vCard"
#: lib/widgets.php:124
msgid "Title (optional):"
msgstr "Tajuk (pilihan):"
#: lib/widgets.php:128
msgid "Street Address:"
msgstr "Alamat"
#: lib/widgets.php:132
msgid "City/Locality:"
msgstr "Bandar/Daerah:"
#: lib/widgets.php:136
msgid "State/Region:"
msgstr "Negeri/Wilayah:"
#: lib/widgets.php:140
msgid "Zipcode/Postal Code:"
msgstr "Poskod:"
#: lib/widgets.php:144
msgid "Telephone:"
msgstr "Telefon:"
#: lib/widgets.php:148
msgid "Email:"
msgstr "Emel:"
#: templates/comments.php:7
#, php-format
msgid "<cite class=\"fn\">%s</cite>"
msgstr "<cite class=\"fn\">%s</cite>"
#: templates/comments.php:8
#, php-format
msgid "%1$s"
msgstr "%1$s"
#: templates/comments.php:9
msgid "(Edit)"
msgstr "(Kemaskini)"
#: templates/comments.php:15
msgid "Your comment is awaiting moderation."
msgstr "Komen anda dalam senarai moderasi."
#: templates/comments.php:32
msgid "This post is password protected. Enter the password to view comments."
msgstr ""
"Artikel ini dilindungi dengan katalaluan. Masukkan katalaluan untuk melihat "
"komen."
#: templates/comments.php:49
msgid "&larr; Older comments"
msgstr "&larr; Komen terdahulu"
#: templates/comments.php:50
msgid "Newer comments &rarr;"
msgstr "Komentar seterusnya &rarr;"
#: templates/comments.php:58 templates/comments.php:68
msgid "Comments are closed."
msgstr "KOmen ditutup."
#: templates/comments.php:75
msgid "Leave a Reply"
msgstr "Tinggalkan Komen"
#: templates/comments.php:75
#, php-format
msgid "Leave a Reply to %s"
msgstr "Balasan untuk %s"
#: templates/comments.php:78
#, php-format
msgid "You must be <a href=\"%s\">logged in</a> to post a comment."
msgstr ""
"Anda dikehendaki <a href=\"%s\">daftar masuk</a> untuk menghantar komen."
#: templates/comments.php:82
#, php-format
msgid "Logged in as <a href=\"%s/wp-admin/profile.php\">%s</a>."
msgstr "Daftar masuk sebagai <a href=\"%s/wp-admin/profile.php\">%s</a>."
#: templates/comments.php:82
msgid "Log out of this account"
msgstr "Daftar keluar bagi akaun ini"
#: templates/comments.php:82
msgid "Log out &raquo;"
msgstr "Daftar keluar &raquo;"
#: templates/comments.php:84
msgid "Name"
msgstr "Nama"
#: templates/comments.php:84 templates/comments.php:86
msgid " (required)"
msgstr "(wajib)"
#: templates/comments.php:86
msgid "Email (will not be published)"
msgstr "Emel (tidak akan diterbitkan)"
#: templates/comments.php:88
msgid "Website"
msgstr "Laman Web"
#: templates/comments.php:91
msgid "Comment"
msgstr "Komen"
#: templates/comments.php:93
msgid "Submit Comment"
msgstr "Hantar Komen"
#: templates/content-single.php:11
msgid "Pages:"
msgstr "Halaman:"
#: templates/content.php:4
msgid "Sorry, no results were found."
msgstr "Maaf, tiada keputusan ditemui."
#: templates/content.php:26
msgid "&larr; Older posts"
msgstr "&larr; Artikel sebelumnya"
#: templates/content.php:27
msgid "Newer posts &rarr;"
msgstr "Artikel selanjutnya &rarr;"
#: templates/page-header.php:8
msgid "Latest Posts"
msgstr "Artikel Terbaru"
#: templates/page-header.php:17
#, php-format
msgid "Daily Archives: %s"
msgstr "Arkib Harian: %s"
#: templates/page-header.php:19
#, php-format
msgid "Monthly Archives: %s"
msgstr "Arkib Bulanan: %s"
#: templates/page-header.php:21
#, php-format
msgid "Yearly Archives: %s"
msgstr "Arkib Tahunan: %s"
#: templates/page-header.php:25
#, php-format
msgid "Author Archives: %s"
msgstr "Arkib Penulis: %s"
#: templates/page-header.php:30
#, php-format
msgid "Search Results for %s"
msgstr "Hasil Carian untuk %s"
#: templates/page-header.php:32
msgid "File Not Found"
msgstr "Fail tidak ditemui"
#: templates/searchform.php:2
msgid "Search for:"
msgstr "Carian untuk:"
#: templates/searchform.php:3 templates/searchform.php:4
msgid "Search"
msgstr "Cari"

Binary file not shown.

View File

@@ -2,366 +2,260 @@ msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Project-Id-Version: Roots Theme i18n: NL_nl\n"
"Project-Id-Version: Roots Theme\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: \n"
"Last-Translator: Herko Coomans <herko.coomans@gmail.com>\n"
"Language-Team: Herko Coomans <herko.coomans@gmail.com>\n"
"Last-Translator: Roy Duineveld <roy@duineveld.me>\n"
"Language-Team: Roy Duineveld <roy@duineveld.me>\n"
"MIME-Version: 1.0\n"
"X-Poedit-Language: Dutch\n"
"X-Poedit-Country: NETHERLANDS\n"
"X-Generator: Poedit 1.5.5\n"
"Language: Dutch\n"
"X-Poedit-SourceCharset: UTF-8\n"
#. Text in echo
#: comments.php:80
#: comments.php:84
msgid " (required)"
msgstr "(verplicht)"
#: 404.php:4
msgid "Sorry, but the page you were trying to view does not exist."
msgstr "Sorry, de pagina die je probeert te bezoeken bestaat niet."
#. Text in echo
#: inc/roots-options.php:127
#: inc/roots-options.php:129
msgid "#main CSS Classes"
msgstr "#main CSS klassen"
#: 404.php:7
msgid "It looks like this was the result of either:"
msgstr "Het lijkt dat er een resultaat is of anders:"
#. Text in echo
#: inc/roots-options.php:137
#: inc/roots-options.php:139
msgid "#sidebar CSS Classes"
msgstr "#sidebar CSS klassen"
#: 404.php:9
msgid "a mistyped address"
msgstr "een verkeerd adres"
#. Text in function
#: comments.php:46
msgid "% Responses to"
msgstr "% reacties op"
#: 404.php:10
msgid "an out-of-date link"
msgstr "een verouderde link"
#. Text in function
#: comments.php:8
msgid "%1$s"
msgstr "%1$s"
#: index.php:5
msgid "Sorry, no results were found."
msgstr "Sorry, geen resultaten gevonden."
#. Text in function
#: inc/roots-options.php:94
msgid "%s Theme Options"
msgstr "%s Thema Opties"
#. Text in function
#: comments.php:53
msgid "&larr; Older comments"
msgstr "&larr; Oudere reacties"
#. Text in function
#: loop-search.php:33
#: loop.php:37
#: index.php:17
msgid "&larr; Older posts"
msgstr "&larr; Oudere berichten"
#. Text in function
#: comments.php:9
msgid "(Edit)"
msgstr "(Bewerk)"
#: index.php:18
msgid "Newer posts &rarr;"
msgstr "Nieuwste berichten &rarr;"
#. Text in function
#: inc/roots-options.php:1
msgid "1140"
msgstr "1140"
#: lib/activation.php:33 lib/activation.php:34
msgid "Theme Activation"
msgstr "Thema Activeren"
#. Text in function
#: inc/roots-options.php:1
msgid "960gs (12 cols)"
msgstr "960gs (12 kolommen)"
#: lib/activation.php:70
msgid "%s Theme Activation"
msgstr "%s Thema Activeren"
#. Text in function
#: inc/roots-options.php:1
msgid "960gs (16 cols)"
msgstr "960gs (16 kolommen)"
#: lib/activation.php:85 lib/activation.php:87
msgid "Create static front page?"
msgstr "Statische voorpagina maken?"
#. Text in function
#: inc/roots-options.php:1
msgid "960gs (24 cols)"
msgstr "960gs (24 kolommen)"
#: lib/activation.php:89 lib/activation.php:102 lib/activation.php:115
#: lib/activation.php:128 lib/activation.php:141
msgid "Yes"
msgstr "Ja"
#. Text in function
#: comments.php:7
msgid "<cite class=\"fn\">%s</cite>"
msgstr "<cite class=\"fn\">%s</cite>"
#: lib/activation.php:90 lib/activation.php:103 lib/activation.php:116
#: lib/activation.php:129 lib/activation.php:142
msgid "No"
msgstr "Nee"
#. Text in function
#: inc/roots-options.php:1
msgid "Adapt.js"
msgstr "Adapt.js"
#: lib/activation.php:93
msgid "Create a page called Home and set it to be the static front page"
msgstr "Maak een \"home\" pagina en stel een statische voorpagina in"
#. Text in echo
#: page-sitemap.php:18
msgid "Archives"
msgstr "Archieven"
#: lib/activation.php:98
msgid "Change permalink structure?"
msgstr "Permalink structuur veranderen?"
#. Text in function
#: inc/roots-options.php:1
msgid "Blueprint CSS"
msgstr "Blueprint CSS"
#: lib/activation.php:100
msgid "Update permalink structure?"
msgstr "Permalink structuur updaten?"
#. Text in echo
#: inc/roots-options.php:106
#: inc/roots-options.php:108
msgid "CSS Grid Framework"
msgstr "CSS Grid Raamwerk"
#: lib/activation.php:106
msgid "Change permalink structure to /&#37;postname&#37;/"
msgstr "Verander permalink structuur naar /&#37;postname&#37;/"
#. Text in echo
#: 404.php:13
msgid "Check your spelling"
msgstr "Controleer de spelling"
#: lib/activation.php:111
msgid "Change uploads folder?"
msgstr "Upload map veranderen?"
#. Text in echo
#: inc/roots-widgets.php:61
msgid "City/Locality:"
msgstr "Plaats:"
#: lib/activation.php:113
msgid "Update uploads folder?"
msgstr "Upload map updaten?"
#. Text in echo
#: 404.php:15
msgid "Click the <a href=\"javascript:history.back()\">Back</a> button"
msgstr "Klik op de <a href=\"javascript:history.back()\">Terug</a> knop"
#: lib/activation.php:119
msgid "Change uploads folder to /assets/ instead of /wp-content/uploads/"
msgstr "Verander upload map naar /assets/ instead of /wp-content/uploads/"
#. Text in echo
#: comments.php:93
msgid "Comment"
msgstr "Reactie"
#: lib/activation.php:124 lib/activation.php:126
msgid "Create navigation menu?"
msgstr "Navigatie menu maken?"
#. Text in echo
#: comments.php:63
msgid "Comments are closed."
msgstr "U kunt niet meer reageren."
#: lib/activation.php:132
msgid "Create the Primary Navigation menu and set the location"
msgstr "Maak een hoofd menu en stel de lokatie in"
#. Text in function
#: inc/roots-cleanup.php:1
#: lib/activation.php:137 lib/activation.php:139
msgid "Add pages to menu?"
msgstr "Pagina's toevoegen aan menu?"
#: lib/activation.php:145
msgid "Add all current published pages to the Primary Navigation"
msgstr "Voeg alle gepubliceerde pagina's toe aan de standaard navigatie"
#: lib/cleanup.php:382
msgid "Continued"
msgstr "Lees verder"
msgstr "Vervolgd"
#. Text in function
#: inc/roots-options.php:132
#: inc/roots-options.php:142
msgid "Default: %s"
msgstr "Standaard: %s"
#: lib/init.php:11
msgid "Primary Navigation"
msgstr "Standaard Navigatie"
#. Text in echo
#: comments.php:84
msgid "Email (will not be published)"
msgstr "E-mail (wordt niet gepubliceerd)"
#. Text in echo
#: inc/roots-widgets.php:77
msgid "Email:"
msgstr "E-mail:"
#. Text in function
#: inc/roots-options.php:152
msgid "Enter your UA-XXXXX-X ID"
msgstr "Voer uw UA-XXXXX-X ID in"
#. Text in echo
#: 404.php:7
msgid "File Not Found"
msgstr "Bestand niet gevonden"
#. Text in echo
#: inc/roots-options.php:147
#: inc/roots-options.php:149
msgid "Google Analytics ID"
msgstr "Google Analytics ID"
#. Text in echo
#: index.php:7
#: lib/utils.php:60
msgid "Latest Posts"
msgstr "Laatste berichten"
#. Text in function
#: comments.php:70
msgid "Leave a Reply"
msgstr "Reageer"
#: lib/utils.php:69
msgid "Daily Archives: %s"
msgstr "Dagelijkse berichten: %s"
#. Text in function
#: comments.php:70
msgid "Leave a Reply to %s"
msgstr "Reageer op %s"
#: lib/utils.php:71
msgid "Monthly Archives: %s"
msgstr "Maandelijkse berichten: %s"
#. Text in echo
#: comments.php:77
msgid "Log out &raquo;"
msgstr "Afmelden &raquo;"
#: lib/utils.php:73
msgid "Yearly Archives: %s"
msgstr "Jaarlijkse berichten: %s"
#. Text in function
#: comments.php:77
msgid "Log out of this account"
msgstr "Dit profiel afmelden"
#: lib/utils.php:75
msgid "Author Archives: %s"
msgstr "Auteurs berichten: %s"
#. Text in function
#: comments.php:77
msgid "Logged in as <a href=\"%s/wp-admin/profile.php\">%s</a>."
msgstr "Aangemeld als <a href=\"%s/wp-admin/profile.php\">%s</a>."
#: lib/utils.php:80
msgid "Search Results for %s"
msgstr "Zoekresultaten voor %s"
#. Text in echo
#: comments.php:80
msgid "Name"
msgstr "Naam"
#: lib/utils.php:82
msgid "Not Found"
msgstr "Niet gevonden"
#. Text in function
#: comments.php:54
msgid "Newer comments &rarr;"
msgstr "Nieuwere reacties &rarr;"
#: lib/utils.php:94
msgid "Please make sure your <a href=\"%s\">.htaccess</a> file is writable "
msgstr "Zorg ervoor dat <a href=\"%s\">.htaccess</a> schrijfbaar is"
#. Text in function
#: loop-search.php:34
#: loop.php:38
msgid "Newer posts &rarr;"
msgstr "Nieuwere berichten &rarr;"
#: lib/widgets.php:8
msgid "Primary Sidebar"
msgstr "Hoofd Sidebar"
#. Text in function
#: comments.php:46
msgid "No Responses to"
msgstr "Geen reacties op"
#: lib/widgets.php:17
msgid "Footer"
msgstr "Footer"
#. Text in function
#: comments.php:46
msgid "One Response to"
msgstr "Een reactie op"
#: lib/widgets.php:45
msgid "Use this widget to add a vCard"
msgstr "Gebruik deze widget om een vCard toe te voegen"
#. Text in echo
#: page-sitemap.php:14
msgid "Pages"
msgstr "Pagina's"
#. Text in function
#: loop-page.php:7
#: loop-single.php:17
msgid "Pages:"
msgstr "Pagina's:"
#. Text in function
#: comments.php:28
msgid "Please do not load this page directly. Thanks!"
msgstr "Deze pagina niet direct laden, a.u.b. Vriendelijk bedankt!"
#. Text in function
#: inc/roots-htaccess.php:1
msgid "Please make sure your <a href=\"%s\">.htaccess</a> file is writeable "
msgstr "Controleer a.u.b of uw <a href=\"%s\">.htaccess</a> bestand schrijfbaar is"
#. Text in echo
#: 404.php:11
msgid "Please try the following:"
msgstr "Probeer a.u.b. het volgende:"
#. Text in function
#: inc/roots-admin.php:1
msgid "Please update your <a href=\"%s\">site tagline</a>"
msgstr "Werk uw <a href=\"%s\">website slogan</a> bij."
#. Text in function
#: loop-single.php:8
#: loop-search.php:16
#: loop.php:16
msgid "Posted on %s at %s."
msgstr "Geplaatst op %s om %s."
#. Text in echo
#: page-sitemap.php:16
msgid "Posts"
msgstr "Berichten"
#. Text in function
#: 404.php:14
msgid "Return to the <a href=\"%s\">home page</a>"
msgstr "Terug naar de <a href=\"%s\">startpagina</a>"
#. Text in function
#: inc/roots-widgets.php:1
#: lib/widgets.php:47
msgid "Roots: vCard"
msgstr "Roots: vCard"
#. Text in echo
#: searchform.php:3
#: searchform.php:4
msgid "Search"
msgstr "Zoeken"
#: lib/widgets.php:74
msgid "vCard"
msgstr "vCard"
#. Text in echo
#: search.php:7
msgid "Search Results for"
msgstr "Zoekresultaten voor"
#: templates/comment.php:4
msgid "%1$s"
msgstr "%1$s"
#. Text in echo
#: searchform.php:2
msgid "Search for:"
msgstr "Zoek naar:"
#: templates/comment.php:5
msgid "(Edit)"
msgstr "(Bewerken)"
#. Text in echo
#: loop-search.php:4
#: loop.php:4
msgid "Sorry, no results were found."
msgstr "Sorry, uw zoekopdracht heeft geen resultaten opgeleverd."
#: templates/comment.php:9
msgid "Your comment is awaiting moderation."
msgstr "Je reactie wacht op goedkeuring."
#. Text in echo
#: inc/roots-widgets.php:65
msgid "State/Region:"
msgstr "Provincie/regio:"
#: templates/comments.php:8
msgid "One Response to &ldquo;%2$s&rdquo;"
msgid_plural "%1$s Responses to &ldquo;%2$s&rdquo;"
msgstr[0] ""
msgstr[1] ""
#. Text in echo
#: inc/roots-widgets.php:57
msgid "Street Address:"
msgstr "Adres:"
#: templates/comments.php:18
msgid "&larr; Older comments"
msgstr "&larr; Oudere reacties"
#. Text in echo
#: comments.php:96
msgid "Submit Comment"
msgstr "Reactie versturen"
#: templates/comments.php:21
msgid "Newer comments &rarr;"
msgstr "Nieuwere reacties &rarr;"
#. Text in echo
#: inc/roots-widgets.php:73
msgid "Telephone:"
msgstr "Telefoon:"
#: templates/comments.php:29 templates/comments.php:38
msgid "Comments are closed."
msgstr "Reageren is niet mogelijk."
#. Text in echo
#: 404.php:9
msgid "The page you are looking for might have been removed, had its name changed, or is temporarily unavailable."
msgstr "De pagina waar u naar op zoek bent is mogelijk verwijderd, van naam veranderd of is tijdelijk niet beschikbaar."
#: templates/comments.php:45
msgid "Leave a Reply"
msgstr "Plaats een reactie"
#. Text in function
#: inc/roots-options.php:1
msgid "Theme Options"
msgstr "Thema opties"
#: templates/comments.php:45
msgid "Leave a Reply to %s"
msgstr "Plaats een reactie bij %s"
#. Text in echo
#: comments.php:36
msgid "This post is password protected. Enter the password to view comments."
msgstr "Dit bericht is beschermd met een wachtwoord. Voer het wachtwoord in om de reacties te bekijken."
#: templates/comments.php:48
msgid "You must be <a href=\"%s\">logged in</a> to post a comment."
msgstr "Je moet <a href=\"%s\">ingelogd</a> zijn om een reactie te plaatsen."
#. Text in echo
#: inc/roots-widgets.php:53
msgid "Title (optional):"
msgstr "Titel (optioneel):"
#: templates/comments.php:53
msgid "Logged in as <a href=\"%s/wp-admin/profile.php\">%s</a>."
msgstr "Ingelogd als <a href=\"%s/wp-admin/profile.php\">%s</a>."
#. Text in echo
#: comments.php:88
#: templates/comments.php:54
msgid "Log out of this account"
msgstr "Dit account uitloggen"
#: templates/comments.php:54
msgid "Log out &raquo;"
msgstr "Uitloggen &raquo;"
#: templates/comments.php:57
msgid "Name"
msgstr "Naam"
#: templates/comments.php:57 templates/comments.php:59
msgid " (required)"
msgstr " (noodzakelijk)"
#: templates/comments.php:59
msgid "Email (will not be published)"
msgstr "Email adres (zal niet getoond worden)"
#: templates/comments.php:61
msgid "Website"
msgstr "Website"
#. Text in echo
#: loop-single.php:10
#: loop-search.php:17
msgid "Written by"
msgstr "Geschreven door"
#: templates/comments.php:64
msgid "Comment"
msgstr "Reactie"
#. Text in function
#: comments.php:73
msgid "You must be <a href=\"%s\">logged in</a> to post a comment."
msgstr "U dient <a href=\"%s\">aangemeld</a> te zijn om te reageren."
#: templates/comments.php:66
msgid "Submit Comment"
msgstr "Reactie toevoegen"
#. Text in echo
#: comments.php:14
msgid "Your comment is awaiting moderation."
msgstr "Uw reactie wacht op goedkeuring."
#: templates/content-single.php:11
msgid "Pages:"
msgstr "Pagina's:"
#. Text in echo
#: inc/roots-widgets.php:69
msgid "Zipcode/Postal Code:"
msgstr "Postcode:"
#: templates/entry-meta.php:2
msgid "By"
msgstr "Door"
#: templates/searchform.php:2
msgid "Search for:"
msgstr "Zoeken naar:"
#: templates/searchform.php:3 templates/searchform.php:4
msgid "Search"
msgstr "Zoeken"

View File

@@ -8,14 +8,9 @@ if (is_admin() && isset($_GET['activated']) && 'themes.php' == $GLOBALS['pagenow
}
function roots_theme_activation_options_init() {
if (roots_get_theme_activation_options() === false) {
add_option('roots_theme_activation_options', roots_get_default_theme_activation_options());
}
register_setting(
'roots_activation_options',
'roots_theme_activation_options',
'roots_theme_activation_options_validate'
'roots_theme_activation_options'
);
}
add_action('admin_init', 'roots_theme_activation_options_init');
@@ -28,7 +23,7 @@ add_filter('option_page_capability_roots_activation_options', 'roots_activation_
function roots_theme_activation_options_add_page() {
$roots_activation_options = roots_get_theme_activation_options();
if ($roots_activation_options['first_run']) {
if (!$roots_activation_options) {
$theme_page = add_theme_page(
__('Theme Activation', 'roots'),
__('Theme Activation', 'roots'),
@@ -38,8 +33,7 @@ function roots_theme_activation_options_add_page() {
);
} else {
if (is_admin() && isset($_GET['page']) && $_GET['page'] === 'theme_activation_options') {
global $wp_rewrite;
$wp_rewrite->flush_rules();
flush_rewrite_rules();
wp_redirect(admin_url('themes.php'));
exit;
}
@@ -47,21 +41,8 @@ function roots_theme_activation_options_add_page() {
}
add_action('admin_menu', 'roots_theme_activation_options_add_page', 50);
function roots_get_default_theme_activation_options() {
$default_theme_activation_options = array(
'first_run' => true,
'create_front_page' => false,
'change_permalink_structure' => false,
'change_uploads_folder' => false,
'create_navigation_menus' => false,
'add_pages_to_primary_navigation' => false,
);
return apply_filters('roots_default_theme_activation_options', $default_theme_activation_options);
}
function roots_get_theme_activation_options() {
return get_option('roots_theme_activation_options', roots_get_default_theme_activation_options());
return get_option('roots_theme_activation_options');
}
function roots_theme_activation_options_render_page() { ?>
@@ -74,12 +55,8 @@ function roots_theme_activation_options_render_page() { ?>
<?php
settings_fields('roots_activation_options');
$roots_activation_options = roots_get_theme_activation_options();
$roots_default_activation_options = roots_get_default_theme_activation_options();
?>
<input type="hidden" value="false" name="roots_theme_activation_options[first_run]">
<table class="form-table">
<tr valign="top"><th scope="row"><?php _e('Create static front page?', 'roots'); ?></th>
@@ -155,32 +132,16 @@ function roots_theme_activation_options_render_page() { ?>
<?php }
function roots_theme_activation_options_validate($input) {
$output = $defaults = roots_get_default_theme_activation_options();
$options = array(
'first_run',
'create_front_page',
'change_permalink_structure',
'change_uploads_folder',
'create_navigation_menus',
'add_pages_to_primary_navigation'
);
foreach($options as $option_name) {
if (isset($input[$option_name])) {
$input[$option_name] = ($input[$option_name] === 'true') ? true : false;
$output[$option_name] = $input[$option_name];
}
function roots_theme_activation_action() {
if (!($roots_theme_activation_options = roots_get_theme_activation_options())) {
return;
}
return apply_filters('roots_theme_activation_options_validate', $output, $input, $defaults);
}
if (strpos(wp_get_referer(), 'page=theme_activation_options') === false) {
return;
}
function roots_theme_activation_action() {
$roots_theme_activation_options = roots_get_theme_activation_options();
if ($roots_theme_activation_options['create_front_page']) {
if ($roots_theme_activation_options['create_front_page'] === 'true') {
$roots_theme_activation_options['create_front_page'] = false;
$default_pages = array('Home');
@@ -215,26 +176,24 @@ function roots_theme_activation_action() {
wp_update_post($home_menu_order);
}
if ($roots_theme_activation_options['change_permalink_structure']) {
if ($roots_theme_activation_options['change_permalink_structure'] === 'true') {
$roots_theme_activation_options['change_permalink_structure'] = false;
global $wp_rewrite;
if (get_option('permalink_structure') !== '/%postname%/') {
global $wp_rewrite;
$wp_rewrite->set_permalink_structure('/%postname%/');
flush_rewrite_rules();
}
$wp_rewrite->init();
$wp_rewrite->flush_rules();
}
if ($roots_theme_activation_options['change_uploads_folder']) {
if ($roots_theme_activation_options['change_uploads_folder'] === 'true') {
$roots_theme_activation_options['change_uploads_folder'] = false;
update_option('uploads_use_yearmonth_folders', 0);
update_option('upload_path', 'assets');
}
if ($roots_theme_activation_options['create_navigation_menus']) {
if ($roots_theme_activation_options['create_navigation_menus'] === 'true') {
$roots_theme_activation_options['create_navigation_menus'] = false;
$roots_nav_theme_mod = false;
@@ -253,7 +212,7 @@ function roots_theme_activation_action() {
}
}
if ($roots_theme_activation_options['add_pages_to_primary_navigation']) {
if ($roots_theme_activation_options['add_pages_to_primary_navigation'] === 'true') {
$roots_theme_activation_options['add_pages_to_primary_navigation'] = false;
$primary_nav = wp_get_nav_menu_object('Primary Navigation');

View File

@@ -138,32 +138,7 @@ add_filter('body_class', 'roots_body_class');
* @author Scott Walkinshaw <scott.walkinshaw@gmail.com>
*/
function roots_root_relative_url($input) {
// Fix for site_url() != home_url()
if (!is_admin() && site_url() != home_url() && stristr($input, 'wp-includes') === false) {
$input = str_replace(site_url(), '', $input);
}
$output = preg_replace_callback(
'!(https?://[^/|"]+)([^"]+)?!',
create_function(
'$matches',
// If full URL is home_url("/") and this isn't a subdir install, return a slash for relative root
'if (isset($matches[0]) && $matches[0] === home_url("/") && str_replace("http://", "", home_url("/", "http"))==$_SERVER["HTTP_HOST"]) { return "/";' .
// If domain is equal to home_url("/"), then make URL relative
'} elseif (isset($matches[0]) && strpos($matches[0], home_url("/")) !== false) { return $matches[2];' .
// If domain is not equal to home_url("/"), do not make external link relative
'} else { return $matches[0]; };'
),
$input
);
// detect and correct for subdir installs
if ($subdir = parse_url(home_url(), PHP_URL_PATH)) {
if (substr($output, 0, strlen($subdir)) == (substr($output, strlen($subdir), strlen($subdir)))) {
$output = substr($output, strlen($subdir));
}
}
$output = wp_make_link_relative($input);
return $output;
}
@@ -174,10 +149,6 @@ function roots_enable_root_relative_urls() {
if (roots_enable_root_relative_urls()) {
$root_rel_filters = array(
'bloginfo_url',
'theme_root_uri',
'stylesheet_directory_uri',
'template_directory_uri',
'plugins_url',
'the_permalink',
'wp_list_pages',
'wp_list_categories',

View File

@@ -28,7 +28,7 @@ class Roots_Walker_Comment extends Walker_Comment {
extract($args, EXTR_SKIP); ?>
<li <?php comment_class('media comment-' . get_comment_ID()); ?>>
<li id="comment-<?php comment_ID(); ?>" <?php comment_class('media comment-' . get_comment_ID()); ?>>
<?php include(locate_template('templates/comment.php')); ?>
<?php
}

View File

@@ -4,7 +4,6 @@
*/
add_theme_support('root-relative-urls'); // Enable relative URLs
add_theme_support('rewrites'); // Enable URL rewrites
add_theme_support('h5bp-htaccess'); // Enable HTML5 Boilerplate's .htaccess
add_theme_support('bootstrap-top-navbar'); // Enable Bootstrap's top navbar
add_theme_support('bootstrap-gallery'); // Enable Bootstrap's thumbnails component on [gallery]
add_theme_support('nice-search'); // Enable /?s= to /search/ redirect
@@ -64,7 +63,7 @@ function roots_display_sidebar() {
* Any of these page templates that return true won't show the sidebar
*/
array(
'page-custom.php'
'template-custom.php'
)
);

View File

@@ -1,420 +0,0 @@
# BEGIN HTML5 Boilerplate
###
### This contains the HTML5 Boilerplate .htaccess that can be found at:
### https://github.com/h5bp/server-configs/blob/master/apache/.htaccess
###
### Added:
### Block access to WordPress files that reveal version information.
###
### Removed:
### Expires headers: Use W3 Total Cache
### ETag removal: Use W3 Total Cache
### Start rewrite engine: Handled by WordPress
### Suppress/force www: Handled by WordPress
### Custom 404 page: Handled by WordPress
###
### Commmented out by default:
### Options -MultiViews: Causes a server 500 error on most shared hosts
###
### Anytime you update this file the .htaccess file in the root of your
### WordPress install is automatically updated with the changes whenever
### the permalinks are flushed or set (see lib/htaccess.php)
###
# ----------------------------------------------------------------------
# Better website experience for IE users
# ----------------------------------------------------------------------
# Force the latest IE version, in various cases when it may fall back to IE7 mode
# github.com/rails/rails/commit/123eb25#commitcomment-118920
# Use ChromeFrame if it's installed for a better experience for the poor IE folk
<IfModule mod_headers.c>
Header set X-UA-Compatible "IE=edge,chrome=1"
# mod_headers can't match by content-type, but we don't want to send this header on *everything*...
<FilesMatch "\.(appcache|crx|css|eot|gif|htc|ico|jpe?g|js|m4a|m4v|manifest|mp4|oex|oga|ogg|ogv|otf|pdf|png|safariextz|svg|svgz|ttf|vcf|webm|webp|woff|xml|xpi)$">
Header unset X-UA-Compatible
</FilesMatch>
</IfModule>
# ----------------------------------------------------------------------
# Cross-domain AJAX requests
# ----------------------------------------------------------------------
# Serve cross-domain Ajax requests, disabled by default.
# enable-cors.org
# code.google.com/p/html5security/wiki/CrossOriginRequestSecurity
# <IfModule mod_headers.c>
# Header set Access-Control-Allow-Origin "*"
# </IfModule>
# ----------------------------------------------------------------------
# CORS-enabled images (@crossorigin)
# ----------------------------------------------------------------------
# Send CORS headers if browsers request them; enabled by default for images.
# developer.mozilla.org/en/CORS_Enabled_Image
# blog.chromium.org/2011/07/using-cross-domain-images-in-webgl-and.html
# hacks.mozilla.org/2011/11/using-cors-to-load-webgl-textures-from-cross-domain-images/
# wiki.mozilla.org/Security/Reviews/crossoriginAttribute
<IfModule mod_setenvif.c>
<IfModule mod_headers.c>
# mod_headers, y u no match by Content-Type?!
<FilesMatch "\.(gif|ico|jpe?g|png|svg|svgz|webp)$">
SetEnvIf Origin ":" IS_CORS
Header set Access-Control-Allow-Origin "*" env=IS_CORS
</FilesMatch>
</IfModule>
</IfModule>
# ----------------------------------------------------------------------
# Webfont access
# ----------------------------------------------------------------------
# Allow access from all domains for webfonts.
# Alternatively you could only whitelist your
# subdomains like "subdomain.example.com".
<IfModule mod_headers.c>
<FilesMatch "\.(eot|font.css|otf|ttc|ttf|woff)$">
Header set Access-Control-Allow-Origin "*"
</FilesMatch>
</IfModule>
# ----------------------------------------------------------------------
# Proper MIME type for all files
# ----------------------------------------------------------------------
# JavaScript
# Normalize to standard type (it's sniffed in IE anyways)
# tools.ietf.org/html/rfc4329#section-7.2
AddType application/javascript js jsonp
AddType application/json json
# Audio
AddType audio/mp4 m4a f4a f4b
AddType audio/ogg oga ogg
# Video
AddType video/mp4 mp4 m4v f4v f4p
AddType video/ogg ogv
AddType video/webm webm
AddType video/x-flv flv
# SVG
# Required for svg webfonts on iPad
# twitter.com/FontSquirrel/status/14855840545
AddType image/svg+xml svg svgz
AddEncoding gzip svgz
# Webfonts
AddType application/font-woff woff
AddType application/vnd.ms-fontobject eot
AddType application/x-font-ttf ttf ttc
AddType font/opentype otf
# Assorted types
AddType application/octet-stream safariextz
AddType application/x-chrome-extension crx
AddType application/x-opera-extension oex
AddType application/x-shockwave-flash swf
AddType application/x-web-app-manifest+json webapp
AddType application/x-xpinstall xpi
AddType application/xml rss atom xml rdf
AddType image/webp webp
AddType image/x-icon ico
AddType text/cache-manifest appcache manifest
AddType text/vtt vtt
AddType text/x-component htc
AddType text/x-vcard vcf
# ----------------------------------------------------------------------
# Allow concatenation from within specific js and css files
# ----------------------------------------------------------------------
# e.g. Inside of script.combined.js you could have
# <!--#include file="libs/jquery-1.5.0.min.js" -->
# <!--#include file="plugins/jquery.idletimer.js" -->
# and they would be included into this single file.
# This is not in use in the boilerplate as it stands. You may
# choose to use this technique if you do not have a build process.
#<FilesMatch "\.combined\.js$">
# Options +Includes
# AddOutputFilterByType INCLUDES application/javascript application/json
# SetOutputFilter INCLUDES
#</FilesMatch>
#<FilesMatch "\.combined\.css$">
# Options +Includes
# AddOutputFilterByType INCLUDES text/css
# SetOutputFilter INCLUDES
#</FilesMatch>
# ----------------------------------------------------------------------
# Gzip compression
# ----------------------------------------------------------------------
<IfModule mod_deflate.c>
# Force deflate for mangled headers developer.yahoo.com/blogs/ydn/posts/2010/12/pushing-beyond-gzipping/
<IfModule mod_setenvif.c>
<IfModule mod_headers.c>
SetEnvIfNoCase ^(Accept-EncodXng|X-cept-Encoding|X{15}|~{15}|-{15})$ ^((gzip|deflate)\s*,?\s*)+|[X~-]{4,13}$ HAVE_Accept-Encoding
RequestHeader append Accept-Encoding "gzip,deflate" env=HAVE_Accept-Encoding
</IfModule>
</IfModule>
# Compress all output labeled with one of the following MIME-types
# (for Apache versions below 2.3.7, you don't need to enable `mod_filter`
# and can remove the `<IfModule mod_filter.c>` and `</IfModule>` lines as
# `AddOutputFilterByType` is still in the core directives)
<IfModule mod_filter.c>
AddOutputFilterByType DEFLATE application/atom+xml \
application/javascript \
application/json \
application/rss+xml \
application/vnd.ms-fontobject \
application/x-font-ttf \
application/xhtml+xml \
application/xml \
font/opentype \
image/svg+xml \
image/x-icon \
text/css \
text/html \
text/plain \
text/x-component \
text/xml
</IfModule>
</IfModule>
# ----------------------------------------------------------------------
# Prevent mobile network providers from modifying your site
# ----------------------------------------------------------------------
# The following header prevents modification of your code over 3G on some
# European providers.
# This is the official 'bypass' suggested by O2 in the UK.
# <IfModule mod_headers.c>
# Header set Cache-Control "no-transform"
# </IfModule>
# ----------------------------------------------------------------------
# Stop screen flicker in IE on CSS rollovers
# ----------------------------------------------------------------------
# The following directives stop screen flicker in IE on CSS rollovers - in
# combination with the "ExpiresByType" rules for images (see above).
# BrowserMatch "MSIE" brokenvary=1
# BrowserMatch "Mozilla/4.[0-9]{2}" brokenvary=1
# BrowserMatch "Opera" !brokenvary
# SetEnvIf brokenvary 1 force-no-vary
# ----------------------------------------------------------------------
# Set Keep-Alive Header
# ----------------------------------------------------------------------
# Keep-Alive allows the server to send multiple requests through one
# TCP-connection. Be aware of possible disadvantages of this setting. Turn on
# if you serve a lot of static content.
# <IfModule mod_headers.c>
# Header set Connection Keep-Alive
# </IfModule>
# ----------------------------------------------------------------------
# Cookie setting from iframes
# ----------------------------------------------------------------------
# Allow cookies to be set from iframes (for IE only)
# If needed, specify a path or regex in the Location directive.
# <IfModule mod_headers.c>
# Header set P3P "policyref=\"/w3c/p3p.xml\", CP=\"IDC DSP COR ADM DEVi TAIi PSA PSD IVAi IVDi CONi HIS OUR IND CNT\""
# </IfModule>
# ----------------------------------------------------------------------
# Built-in filename-based cache busting
# ----------------------------------------------------------------------
# If you're not using the build script to manage your filename version revving,
# you might want to consider enabling this, which will route requests for
# `/css/style.20110203.css` to `/css/style.css`.
# To understand why this is important and a better idea than all.css?v1231,
# please refer to the bundled documentation about `.htaccess`.
# <IfModule mod_rewrite.c>
# RewriteCond %{REQUEST_FILENAME} !-f
# RewriteCond %{REQUEST_FILENAME} !-d
# RewriteRule ^(.+)\.(\d+)\.(js|css|png|jpg|gif)$ $1.$3 [L]
# </IfModule>
# ----------------------------------------------------------------------
# Prevent SSL cert warnings
# ----------------------------------------------------------------------
# Rewrite secure requests properly to prevent SSL cert warnings, e.g. prevent
# https://www.example.com when your cert only allows https://secure.example.com
# <IfModule mod_rewrite.c>
# RewriteCond %{SERVER_PORT} !^443
# RewriteRule ^ https://example-domain-please-change-me.com%{REQUEST_URI} [R=301,L]
# </IfModule>
# ----------------------------------------------------------------------
# Force client-side SSL redirection
# ----------------------------------------------------------------------
# If a user types "example.com" in her browser, the above rule will redirect her
# to the secure version of the site. That still leaves a window of opportunity
# (the initial HTTP connection) for an attacker to downgrade or redirect the
# request. The following header ensures that browser will **only** connect to
# your server via HTTPS, regardless of what users type in the address bar.
# <IfModule mod_headers.c>
# Header set Strict-Transport-Security max-age=16070400;
# </IfModule>
# ----------------------------------------------------------------------
# Prevent 404 errors for non-existing redirected folders
# ----------------------------------------------------------------------
# without -MultiViews, Apache will give a 404 for a rewrite if a folder of the
# same name does not exist.
# webmasterworld.com/apache/3808792.htm
# Options -MultiViews
# ----------------------------------------------------------------------
# UTF-8 encoding
# ----------------------------------------------------------------------
# Use UTF-8 encoding for anything served text/plain or text/html
AddDefaultCharset utf-8
# Force UTF-8 for a number of file formats
AddCharset utf-8 .atom .css .js .json .rss .vtt .xml
# ----------------------------------------------------------------------
# A little more security
# ----------------------------------------------------------------------
# To avoid displaying the exact version number of Apache being used, add the
# following to httpd.conf (it will not work in .htaccess):
# ServerTokens Prod
# "-Indexes" will have Apache block users from browsing folders without a
# default document Usually you should leave this activated, because you
# shouldn't allow everybody to surf through every folder on your server (which
# includes rather private places like CMS system folders).
<IfModule mod_autoindex.c>
Options -Indexes
</IfModule>
# Block access to "hidden" directories or files whose names begin with a
# period. This includes directories used by version control systems such as
# Subversion or Git.
<IfModule mod_rewrite.c>
RewriteCond %{SCRIPT_FILENAME} -d [OR]
RewriteCond %{SCRIPT_FILENAME} -f
RewriteRule "(^|/)\." - [F]
</IfModule>
# Block access to backup and source files. These files may be left by some
# text/html editors and pose a great security danger, when anyone can access
# them.
<FilesMatch "(\.(bak|config|dist|fla|inc|ini|log|psd|sh|sql|swp)|~)$">
Order allow,deny
Deny from all
Satisfy All
</FilesMatch>
# If your server is not already configured as such, the following directive
# should be uncommented in order to set PHP's register_globals option to OFF.
# This closes a major security hole that is abused by most XSS (cross-site
# scripting) attacks. For more information: http://php.net/register_globals
#
# IF REGISTER_GLOBALS DIRECTIVE CAUSES 500 INTERNAL SERVER ERRORS:
#
# Your server does not allow PHP directives to be set via .htaccess. In that
# case you must make this change in your php.ini file instead. If you are
# using a commercial web host, contact the administrators for assistance in
# doing this. Not all servers allow local php.ini files, and they should
# include all PHP configurations (not just this one), or you will effectively
# reset everything to PHP defaults. Consult www.php.net for more detailed
# information about setting PHP directives.
# php_flag register_globals Off
# Rename session cookie to something else, than PHPSESSID
# php_value session.name sid
# Disable magic quotes (This feature has been DEPRECATED as of PHP 5.3.0 and REMOVED as of PHP 5.4.0.)
# php_flag magic_quotes_gpc Off
# Do not show you are using PHP
# Note: Move this line to php.ini since it won't work in .htaccess
# php_flag expose_php Off
# Level of log detail - log all errors
# php_value error_reporting -1
# Write errors to log file
# php_flag log_errors On
# Do not display errors in browser (production - Off, development - On)
# php_flag display_errors Off
# Do not display startup errors (production - Off, development - On)
# php_flag display_startup_errors Off
# Format errors in plain text
# Note: Leave this setting 'On' for xdebug's var_dump() output
# php_flag html_errors Off
# Show multiple occurrence of error
# php_flag ignore_repeated_errors Off
# Show same errors from different sources
# php_flag ignore_repeated_source Off
# Size limit for error messages
# php_value log_errors_max_len 1024
# Don't precede error with string (doesn't accept empty string, use whitespace if you need)
# php_value error_prepend_string " "
# Don't prepend to error (doesn't accept empty string, use whitespace if you need)
# php_value error_append_string " "
# Increase cookie security
<IfModule mod_php5.c>
php_value session.cookie_httponly true
</IfModule>

View File

@@ -1,26 +0,0 @@
<?php
/**
* Add HTML5 Boilerplate's .htaccess via WordPress
*/
function roots_add_h5bp_htaccess($content) {
global $wp_rewrite;
$home_path = function_exists('get_home_path') ? get_home_path() : ABSPATH;
$htaccess_file = $home_path . '.htaccess';
$mod_rewrite_enabled = function_exists('got_mod_rewrite') ? got_mod_rewrite() : false;
if ((!file_exists($htaccess_file) && is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks()) || is_writable($htaccess_file)) {
if ($mod_rewrite_enabled) {
$h5bp_rules = extract_from_markers($htaccess_file, 'HTML5 Boilerplate');
if ($h5bp_rules === array()) {
$filename = dirname(__FILE__) . '/h5bp-htaccess';
return insert_with_markers($htaccess_file, 'HTML5 Boilerplate', extract_from_markers($filename, 'HTML5 Boilerplate'));
}
}
}
return $content;
}
if (current_theme_supports('h5bp-htaccess')) {
add_action('generate_rewrite_rules', 'roots_add_h5bp_htaccess');
}

View File

@@ -30,9 +30,7 @@ if (!defined('__DIR__')) { define('__DIR__', dirname(__FILE__)); }
// Define helper constants
$get_theme_name = explode('/themes/', get_template_directory());
define('WP_BASE', wp_base_dir());
define('THEME_NAME', next($get_theme_name));
define('RELATIVE_PLUGIN_PATH', str_replace(site_url() . '/', '', plugins_url()));
define('FULL_RELATIVE_PLUGIN_PATH', WP_BASE . '/' . RELATIVE_PLUGIN_PATH);
define('RELATIVE_CONTENT_PATH', str_replace(site_url() . '/', '', content_url()));
define('RELATIVE_PLUGIN_PATH', str_replace(home_url() . '/', '', plugins_url()));
define('RELATIVE_CONTENT_PATH', str_replace(home_url() . '/', '', content_url()));
define('THEME_PATH', RELATIVE_CONTENT_PATH . '/themes/' . THEME_NAME);

View File

@@ -28,14 +28,14 @@ function roots_add_rewrites($content) {
}
function roots_clean_urls($content) {
if (strpos($content, FULL_RELATIVE_PLUGIN_PATH) === 0) {
return str_replace(FULL_RELATIVE_PLUGIN_PATH, WP_BASE . '/plugins', $content);
if (strpos($content, RELATIVE_PLUGIN_PATH) > 0) {
return str_replace('/' . RELATIVE_PLUGIN_PATH, '/plugins', $content);
} else {
return str_replace('/' . THEME_PATH, '', $content);
}
}
if (!is_multisite() && !is_child_theme() && get_option('permalink_structure')) {
if (!is_multisite() && !is_child_theme()) {
if (current_theme_supports('rewrites')) {
add_action('generate_rewrite_rules', 'roots_add_rewrites');
}

View File

@@ -85,43 +85,6 @@ function roots_title() {
}
}
/**
* Show an admin notice if .htaccess isn't writable
*/
function roots_htaccess_writable() {
if (!is_writable(get_home_path() . '.htaccess')) {
if (current_user_can('administrator')) {
add_action('admin_notices', create_function('', "echo '<div class=\"error\"><p>" . sprintf(__('Please make sure your <a href="%s">.htaccess</a> file is writable ', 'roots'), admin_url('options-permalink.php')) . "</p></div>';"));
}
}
}
if (current_theme_supports('h5bp-htaccess')) {
add_action('admin_init', 'roots_htaccess_writable');
}
/**
* Return WordPress subdirectory if applicable
*/
function wp_base_dir() {
preg_match('!(https?://[^/|"]+)([^"]+)?!', site_url(), $matches);
if (count($matches) === 3) {
return end($matches);
} else {
return '';
}
}
/**
* Opposite of built in WP functions for trailing slashes
*/
function leadingslashit($string) {
return '/' . unleadingslashit($string);
}
function unleadingslashit($string) {
return ltrim($string, '/');
}
function add_filters($tags, $function) {
foreach($tags as $tag) {
add_filter($tag, $function);

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

View File

@@ -2,7 +2,7 @@
Theme Name: Roots
Theme URI: http://www.rootstheme.com/
Description: Roots is a starting WordPress theme made for developers that's based on HTML5 Boilerplate and Bootstrap. <a href="https://github.com/retlehs/roots/contributors">Contribute on GitHub</a>
Version: 6.3.0
Version: 6.4.0
Author: Ben Word
Author URI: http://benword.com/