Merge master

CHANGELOG.md

@@ -1,4 +1,15 @@
 ### HEAD
+* Change media directory from `/assets/` to `/media/`
+* Update to Bootstrap 2.3.2
+* Update to Google Universal Analytics
+* Update to jQuery 1.10.1
+* Show author display name for author archives
+* Add Serbian translation
+* Remove post tags from templates
+* Remove TinyMCE valid elements tweaks (no longer necessary)
+* Remove additional widget classes
+* Move `/assets/css/less/` to `/assets/less/`
+* Add wrapper templates filter
 * Fix relative external URLs issue
 
 ### 6.4.0: May 1st, 2013

Gruntfile.js

@@ -21,9 +21,9 @@ module.exports = function(grunt) {
         },
         files: {
           'assets/css/main.min.css': [
-            'assets/css/less/bootstrap/bootstrap.less',
+            'assets/less/bootstrap/bootstrap.less',
-            'assets/css/less/bootstrap/responsive.less',
+            'assets/less/bootstrap/responsive.less',
-            'assets/css/less/app.less'
+            'assets/less/app.less'
           ]
         }
       }
@@ -53,8 +53,8 @@ module.exports = function(grunt) {
     watch: {
       less: {
         files: [
-          'assets/css/less/*.less',
+          'assets/less/*.less',
-          'assets/css/less/bootstrap/*.less'
+          'assets/less/bootstrap/*.less'
         ],
         tasks: ['recess', 'version']
       },

assets/js/plugins/bootstrap/bootstrap-affix.js

@@ -1,5 +1,5 @@
 /* ==========================================================
- * bootstrap-affix.js v2.3.1
+ * bootstrap-affix.js v2.3.2
  * http://twitter.github.com/bootstrap/javascript.html#affix
  * ==========================================================
  * Copyright 2012 Twitter, Inc.

assets/js/plugins/bootstrap/bootstrap-alert.js

@@ -1,5 +1,5 @@
 /* ==========================================================
- * bootstrap-alert.js v2.3.1
+ * bootstrap-alert.js v2.3.2
  * http://twitter.github.com/bootstrap/javascript.html#alerts
  * ==========================================================
  * Copyright 2012 Twitter, Inc.

assets/js/plugins/bootstrap/bootstrap-button.js

@@ -1,5 +1,5 @@
 /* ============================================================
- * bootstrap-button.js v2.3.1
+ * bootstrap-button.js v2.3.2
  * http://twitter.github.com/bootstrap/javascript.html#buttons
  * ============================================================
  * Copyright 2012 Twitter, Inc.

assets/js/plugins/bootstrap/bootstrap-carousel.js

@@ -1,5 +1,5 @@
 /* ==========================================================
- * bootstrap-carousel.js v2.3.1
+ * bootstrap-carousel.js v2.3.2
  * http://twitter.github.com/bootstrap/javascript.html#carousel
  * ==========================================================
  * Copyright 2012 Twitter, Inc.

assets/js/plugins/bootstrap/bootstrap-collapse.js

@@ -1,5 +1,5 @@
 /* =============================================================
- * bootstrap-collapse.js v2.3.1
+ * bootstrap-collapse.js v2.3.2
  * http://twitter.github.com/bootstrap/javascript.html#collapse
  * =============================================================
  * Copyright 2012 Twitter, Inc.

assets/js/plugins/bootstrap/bootstrap-dropdown.js

@@ -1,5 +1,5 @@
 /* ============================================================
- * bootstrap-dropdown.js v2.3.1
+ * bootstrap-dropdown.js v2.3.2
  * http://twitter.github.com/bootstrap/javascript.html#dropdowns
  * ============================================================
  * Copyright 2012 Twitter, Inc.
@@ -52,6 +52,10 @@
       clearMenus()
 
       if (!isActive) {
+        if ('ontouchstart' in document.documentElement) {
+          // if mobile we we use a backdrop because click events don't delegate
+          $('<div class="dropdown-backdrop"/>').insertBefore($(this)).on('click', clearMenus)
+        }
         $parent.toggleClass('open')
       }
 
@@ -104,6 +108,7 @@
   }
 
   function clearMenus() {
+    $('.dropdown-backdrop').remove()
     $(toggle).each(function () {
       getParent($(this)).removeClass('open')
     })
@@ -158,7 +163,6 @@
   $(document)
     .on('click.dropdown.data-api', clearMenus)
     .on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
-    .on('click.dropdown-menu', function (e) { e.stopPropagation() })
     .on('click.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
     .on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
 

assets/js/plugins/bootstrap/bootstrap-modal.js

@@ -1,5 +1,5 @@
 /* =========================================================
- * bootstrap-modal.js v2.3.1
+ * bootstrap-modal.js v2.3.2
  * http://twitter.github.com/bootstrap/javascript.html#modals
  * =========================================================
  * Copyright 2012 Twitter, Inc.

assets/js/plugins/bootstrap/bootstrap-popover.js

@@ -1,5 +1,5 @@
 /* ===========================================================
- * bootstrap-popover.js v2.3.1
+ * bootstrap-popover.js v2.3.2
  * http://twitter.github.com/bootstrap/javascript.html#popovers
  * ===========================================================
  * Copyright 2012 Twitter, Inc.

assets/js/plugins/bootstrap/bootstrap-scrollspy.js

@@ -1,5 +1,5 @@
 /* =============================================================
- * bootstrap-scrollspy.js v2.3.1
+ * bootstrap-scrollspy.js v2.3.2
  * http://twitter.github.com/bootstrap/javascript.html#scrollspy
  * =============================================================
  * Copyright 2012 Twitter, Inc.

assets/js/plugins/bootstrap/bootstrap-tab.js

@@ -1,5 +1,5 @@
 /* ========================================================
- * bootstrap-tab.js v2.3.1
+ * bootstrap-tab.js v2.3.2
  * http://twitter.github.com/bootstrap/javascript.html#tabs
  * ========================================================
  * Copyright 2012 Twitter, Inc.

assets/js/plugins/bootstrap/bootstrap-tooltip.js

@@ -1,5 +1,5 @@
 /* ===========================================================
- * bootstrap-tooltip.js v2.3.1
+ * bootstrap-tooltip.js v2.3.2
  * http://twitter.github.com/bootstrap/javascript.html#tooltips
  * Inspired by the original jQuery.tipsy by Jason Frame
  * ===========================================================

assets/js/plugins/bootstrap/bootstrap-transition.js

@@ -1,5 +1,5 @@
 /* ===================================================
- * bootstrap-transition.js v2.3.1
+ * bootstrap-transition.js v2.3.2
  * http://twitter.github.com/bootstrap/javascript.html#transitions
  * ===================================================
  * Copyright 2012 Twitter, Inc.

assets/js/plugins/bootstrap/bootstrap-typeahead.js

@@ -1,5 +1,5 @@
 /* =============================================================
- * bootstrap-typeahead.js v2.3.1
+ * bootstrap-typeahead.js v2.3.2
  * http://twitter.github.com/bootstrap/javascript.html#typeahead
  * =============================================================
  * Copyright 2012 Twitter, Inc.

assets/less/bootstrap/bootstrap.less

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v2.3.1
+ * Bootstrap v2.3.2
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0

assets/less/bootstrap/dropdowns.less

@@ -135,6 +135,17 @@
   }
 }
 
+// Backdrop to catch body clicks on mobile, etc.
+// ---------------------------
+.dropdown-backdrop {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  top: 0;
+  z-index: @zindexDropdown - 10;
+}
+
 // Right aligned dropdowns
 // ---------------------------
 .pull-right > .dropdown-menu {

assets/less/bootstrap/responsive.less

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Responsive v2.3.1
+ * Bootstrap Responsive v2.3.2
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0

base.php

@@ -1,7 +1,7 @@
 <?php get_template_part('templates/head'); ?>
 <body <?php body_class(); ?>>
 
-  <!--[if lt IE 7]><div class="alert">Your browser is <em>ancient!</em> <a href="http://browsehappy.com/">Upgrade to a different browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">install Google Chrome Frame</a> to experience this site.</div><![endif]-->
+  <!--[if lt IE 7]><div class="alert">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a> to improve your experience.</div><![endif]-->
 
   <?php
     do_action('get_header');

doc/activation.md

@@ -17,7 +17,7 @@ Change permalink structure to `/%postname%/`. This is normally handled from the
 
 ### Change uploads folder
 
-Change uploads folder to `/assets/` instead of `/wp-content/uploads/`. This is normally handled from the Media settings.
+Change uploads folder to `/media/` instead of `/wp-content/uploads/`.
 
 ### Create navigation menu
 

doc/usage.md

@@ -16,20 +16,20 @@ A basic Roots theme initially looks like this:
 .
 ├── assets
 │   ├── css
-│   │   ├── less
-│   │   │   │── bootstrap.less
-│   │   │   └── responsive.less
 │   │   │── app.css
 │   │   │── bootstrap.css
 │   │   │── bootstrap-responsive.css
 │   │   │── editor-style.css
 │   ├── img
-│   └── js
+│   ├── js
-│       ├── main.js
+│   │   ├── main.js
-│       ├── plugins.js (includes bootstrap.js)
+│   │   ├── plugins.js (includes bootstrap.js)
-│       └── vendor
+│   │   └── vendor
-│           ├── jquery-1.9.1.min.js
+│   │       ├── jquery-1.9.1.min.js
-│           └── modernizr-2.6.2.min.js
+│   │       └── modernizr-2.6.2.min.js
+│   └── less
+│   │   │── bootstrap.less
+│   │   └── responsive.less
 ├── doc
 ├── lang
 │   └── roots.pot

lang/ms_MY.po

@@ -2,271 +2,253 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Roots Bahasa Melayu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-28 11:22-0300\n"
+"POT-Creation-Date: 2013-05-13 13:46+0800\n"
-"PO-Revision-Date: 2013-04-11 15:23+0800\n"
+"PO-Revision-Date: 2013-05-13 13:46+0800\n"
 "Last-Translator: Hariadi Hinta <diperakui@gmail.com>\n"
 "Language-Team: Hariadi Hinta <diperakui@gmail.com>\n"
+"Language: Bahasa Melayu\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
+#: 404.php:4
-msgid ""
+msgid "Sorry, but the page you were trying to view does not exist."
-"The page you are looking for might have been removed, had its name changed, "
+msgstr "Maaf, tetapi halaman yang anda cuba untuk capai tidak wujud."
-"or is temporarily unavailable."
-msgstr ""
-"Halaman yang anda cari mungkin telah dipindahkan, ditukar nama, atau tidak "
-"dapat diakses untuk sementara."
 
-#: 404.php:8
+#: 404.php:7
-msgid "Please try the following:"
+msgid "It looks like this was the result of either:"
-msgstr "Sila cuba yang berikut:"
+msgstr "Ia kelihatan seperti ini adalah hasil sama ada:"
+
+#: 404.php:9
+msgid "a mistyped address"
+msgstr "salah taip alamat"
 
 #: 404.php:10
-msgid "Check your spelling"
+msgid "an out-of-date link"
-msgstr "Semak ejaan anda"
+msgstr "pautan tamat tempoh"
 
-#: 404.php:11
+#: index.php:5
-#, php-format
+msgid "Sorry, no results were found."
-msgid "Return to the <a href=\"%s\">home page</a>"
+msgstr "Maaf, tiada keputusan ditemui."
-msgstr "Kembali ke <a href=\"%s\">Halaman Utama</a>"
 
-#: 404.php:12
+#: index.php:17
-msgid "Click the <a href=\"javascript:history.back()\">Back</a> button"
+msgid "&larr; Older posts"
-msgstr "Klik pautan <a href=\"javascript:history.back()\">Kembali</a>"
+msgstr "&larr; Artikel sebelumnya"
 
-#: functions.php:28
+#: index.php:18
-msgid "Primary Navigation"
+msgid "Newer posts &rarr;"
-msgstr "Menu Utama"
+msgstr "Artikel selanjutnya &rarr;"
 
-#: lib/activation.php:32 lib/activation.php:33
+#: lib/activation.php:28 lib/activation.php:29
 msgid "Theme Activation"
 msgstr "Pengaktifan tema"
 
-#: lib/activation.php:72
+#: lib/activation.php:51
 #, php-format
 msgid "%s Theme Activation"
 msgstr "%s Pengaktifan tema"
 
-#: lib/activation.php:87 lib/activation.php:89
+#: lib/activation.php:62 lib/activation.php:64
 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:66 lib/activation.php:79 lib/activation.php:92
-#: lib/activation.php:130 lib/activation.php:143
+#: lib/activation.php:105 lib/activation.php:118
 msgid "Yes"
 msgstr "Ya"
 
-#: lib/activation.php:92 lib/activation.php:105 lib/activation.php:118
+#: lib/activation.php:67 lib/activation.php:80 lib/activation.php:93
-#: lib/activation.php:131 lib/activation.php:144
+#: lib/activation.php:106 lib/activation.php:119
 msgid "No"
 msgstr "Tidak"
 
-#: lib/activation.php:95
+#: lib/activation.php:70
 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
+#: lib/activation.php:75
 msgid "Change permalink structure?"
 msgstr "Ubah struktur permalink?"
 
-#: lib/activation.php:102
+#: lib/activation.php:77
 msgid "Update permalink structure?"
 msgstr "Kemaskini struktur permalink?"
 
-#: lib/activation.php:108
+#: lib/activation.php:83
 msgid "Change permalink structure to /&#37;postname&#37;/"
 msgstr "Tukar struktur permalink menjadi /&#37;postname&#37;/"
 
-#: lib/activation.php:113
+#: lib/activation.php:88
 msgid "Change uploads folder?"
 msgstr "Tukar folder muat naik?"
 
-#: lib/activation.php:115
+#: lib/activation.php:90
 msgid "Update uploads folder?"
 msgstr "Kemaskini folder muat naik?"
 
-#: lib/activation.php:121
+#: lib/activation.php:96
 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
+#: lib/activation.php:101 lib/activation.php:103
 msgid "Create navigation menu?"
 msgstr "Buat menu navigasi?"
 
-#: lib/activation.php:134
+#: lib/activation.php:109
 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
+#: lib/activation.php:114 lib/activation.php:116
 msgid "Add pages to menu?"
 msgstr "Tambah halaman ke menu?"
 
-#: lib/activation.php:147
+#: lib/activation.php:122
 msgid "Add all current published pages to the Primary Navigation"
 msgstr "Tambah semua halaman yang sudah diterbitkan ke Menu Utama"
 
-#: lib/cleanup.php:404
+#: lib/cleanup.php:358
 msgid "Continued"
 msgstr "Teruskan"
 
-#: lib/htaccess.php:26
+#: lib/init.php:11
+msgid "Primary Navigation"
+msgstr "Menu Utama"
+
+#: lib/utils.php:60
+msgid "Latest Posts"
+msgstr "Artikel Terbaru"
+
+#: lib/utils.php:69
 #, php-format
-msgid "Please make sure your <a href=\"%s\">.htaccess</a> file is writable "
+msgid "Daily Archives: %s"
-msgstr ""
+msgstr "Arkib Harian: %s"
-"Sila pastikan <a href=\"%s\">.htaccess</a> anda berkeupayaan untuk ditulis"
 
-#: lib/template-tags.php:5
+#: lib/utils.php:71
 #, php-format
-msgid "Posted on %s at %s."
+msgid "Monthly Archives: %s"
-msgstr "Diterbitkan pada %s %s"
+msgstr "Arkib Bulanan: %s"
 
-#: lib/template-tags.php:6
+#: lib/utils.php:73
-msgid "Written by"
+#, php-format
-msgstr "Ditulis oleh"
+msgid "Yearly Archives: %s"
+msgstr "Arkib Tahunan: %s"
 
-#: lib/widgets.php:6
+#: lib/utils.php:75
+#, php-format
+msgid "Author Archives: %s"
+msgstr "Arkib Penulis: %s"
+
+#: lib/utils.php:80
+#, php-format
+msgid "Search Results for %s"
+msgstr "Hasil Carian untuk %s"
+
+#: lib/utils.php:82
+msgid "Not Found"
+msgstr "Tidak ditemui"
+
+#: lib/widgets.php:8
 msgid "Primary Sidebar"
 msgstr "Sidebar Utama"
 
-#: lib/widgets.php:14
+#: lib/widgets.php:17
 msgid "Footer"
 msgstr "Footer"
 
-#: lib/widgets.php:30
+#: lib/widgets.php:45
 msgid "Use this widget to add a vCard"
 msgstr "Gunakan widget ini untuk menambah vCard"
 
-#: lib/widgets.php:31
+#: lib/widgets.php:47
 msgid "Roots: vCard"
 msgstr "Roots: vCard"
 
-#: lib/widgets.php:58
+#: lib/widgets.php:74
 msgid "vCard"
 msgstr "vCard"
 
-#: lib/widgets.php:124
+#: templates/comment.php:4
-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
+#: templates/comment.php:5
 msgid "(Edit)"
 msgstr "(Kemaskini)"
 
-#: templates/comments.php:15
+#: templates/comment.php:9
 msgid "Your comment is awaiting moderation."
 msgstr "Komen anda dalam senarai moderasi."
 
-#: templates/comments.php:32
+#: templates/comments.php:18
-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
+#: templates/comments.php:21
 msgid "Newer comments &rarr;"
 msgstr "Komentar seterusnya &rarr;"
 
-#: templates/comments.php:58 templates/comments.php:68
+#: templates/comments.php:29 templates/comments.php:38
 msgid "Comments are closed."
 msgstr "KOmen ditutup."
 
-#: templates/comments.php:75
+#: templates/comments.php:45
 msgid "Leave a Reply"
 msgstr "Tinggalkan Komen"
 
-#: templates/comments.php:75
+#: templates/comments.php:45
 #, php-format
 msgid "Leave a Reply to %s"
 msgstr "Balasan untuk %s"
 
-#: templates/comments.php:78
+#: templates/comments.php:48
 #, 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
+#: templates/comments.php:53
 #, 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
+#: templates/comments.php:54
 msgid "Log out of this account"
 msgstr "Daftar keluar bagi akaun ini"
 
-#: templates/comments.php:82
+#: templates/comments.php:54
 msgid "Log out &raquo;"
 msgstr "Daftar keluar &raquo;"
 
-#: templates/comments.php:84
+#: templates/comments.php:57
 msgid "Name"
 msgstr "Nama"
 
-#: templates/comments.php:84 templates/comments.php:86
+#: templates/comments.php:57 templates/comments.php:59
 msgid " (required)"
 msgstr "(wajib)"
 
-#: templates/comments.php:86
+#: templates/comments.php:59
 msgid "Email (will not be published)"
 msgstr "Emel (tidak akan diterbitkan)"
 
-#: templates/comments.php:88
+#: templates/comments.php:61
 msgid "Website"
 msgstr "Laman Web"
 
-#: templates/comments.php:91
+#: templates/comments.php:64
 msgid "Comment"
 msgstr "Komen"
 
-#: templates/comments.php:93
+#: templates/comments.php:66
 msgid "Submit Comment"
 msgstr "Hantar Komen"
 
@@ -274,50 +256,9 @@ msgstr "Hantar Komen"
 msgid "Pages:"
 msgstr "Halaman:"
 
-#: templates/content.php:4
+#: templates/entry-meta.php:2
-msgid "Sorry, no results were found."
+msgid "By"
-msgstr "Maaf, tiada keputusan ditemui."
+msgstr "Oleh"
-
-#: 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:"
@@ -326,3 +267,62 @@ msgstr "Carian untuk:"
 #: templates/searchform.php:3 templates/searchform.php:4
 msgid "Search"
 msgstr "Cari"
+
+#~ 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."
+
+#~ msgid "Please try the following:"
+#~ msgstr "Sila cuba yang berikut:"
+
+#~ msgid "Check your spelling"
+#~ msgstr "Semak ejaan anda"
+
+#~ msgid "Return to the <a href=\"%s\">home page</a>"
+#~ msgstr "Kembali ke <a href=\"%s\">Halaman Utama</a>"
+
+#~ msgid "Click the <a href=\"javascript:history.back()\">Back</a> button"
+#~ msgstr "Klik pautan <a href=\"javascript:history.back()\">Kembali</a>"
+
+#~ 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"
+
+#~ msgid "Posted on %s at %s."
+#~ msgstr "Diterbitkan pada %s %s"
+
+#~ msgid "Written by"
+#~ msgstr "Ditulis oleh"
+
+#~ msgid "Title (optional):"
+#~ msgstr "Tajuk (pilihan):"
+
+#~ msgid "Street Address:"
+#~ msgstr "Alamat"
+
+#~ msgid "City/Locality:"
+#~ msgstr "Bandar/Daerah:"
+
+#~ msgid "State/Region:"
+#~ msgstr "Negeri/Wilayah:"
+
+#~ msgid "Zipcode/Postal Code:"
+#~ msgstr "Poskod:"
+
+#~ msgid "Telephone:"
+#~ msgstr "Telefon:"
+
+#~ msgid "Email:"
+#~ msgstr "Emel:"
+
+#~ msgid "<cite class=\"fn\">%s</cite>"
+#~ msgstr "<cite class=\"fn\">%s</cite>"
+
+#~ msgid ""
+#~ "This post is password protected. Enter the password to view comments."
+#~ msgstr ""
+#~ "Artikel ini dilindungi dengan katalaluan. Masukkan katalaluan untuk "
+#~ "melihat komen."

lang/sr_rs.pot

@@ -0,0 +1,263 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: lautreamont <lautreamont33@gmail.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"X-Generator: Poedit 1.5.5\n"
+
+#: 404.php:4
+msgid "Sorry, but the page you were trying to view does not exist."
+msgstr "Страна коју сте тражили непостоји."
+
+#: 404.php:7
+msgid "It looks like this was the result of either:"
+msgstr "Што је резултат:"
+
+#: 404.php:9
+msgid "a mistyped address"
+msgstr "или погрешно укуцане адресе"
+
+#: 404.php:10
+msgid "an out-of-date link"
+msgstr "или измењене/застареле везе"
+
+#: index.php:5
+msgid "Sorry, no results were found."
+msgstr "Нема резултата претраге."
+
+#: index.php:17
+msgid "&larr; Older posts"
+msgstr "&larr; Старији чланци"
+
+#: index.php:18
+msgid "Newer posts &rarr;"
+msgstr "Новији чланци &rarr;"
+
+#: lib/activation.php:33 lib/activation.php:34
+msgid "Theme Activation"
+msgstr "Активирање теме"
+
+#: lib/activation.php:70
+msgid "%s Theme Activation"
+msgstr "%s Активирање теме"
+
+#: lib/activation.php:85 lib/activation.php:87
+msgid "Create static front page?"
+msgstr "Да направимо статичну насловну страну?"
+
+#: lib/activation.php:89 lib/activation.php:102 lib/activation.php:115
+#: lib/activation.php:128 lib/activation.php:141
+msgid "Yes"
+msgstr "Да"
+
+#: lib/activation.php:90 lib/activation.php:103 lib/activation.php:116
+#: lib/activation.php:129 lib/activation.php:142
+msgid "No"
+msgstr "Не"
+
+#: lib/activation.php:93
+msgid "Create a page called Home and set it to be the static front page"
+msgstr ""
+"Да креирамо страну под називом Home и поставимо је као статичну насловну "
+"страну"
+
+#: lib/activation.php:98
+msgid "Change permalink structure?"
+msgstr "Измени структуру сталних веза?"
+
+#: lib/activation.php:100
+msgid "Update permalink structure?"
+msgstr "Запамти структуру сталних веза?"
+
+#: lib/activation.php:106
+msgid "Change permalink structure to /&#37;postname&#37;/"
+msgstr "Измени структуру сталних веза у /&#37;називпоста&#37;/"
+
+#: lib/activation.php:111
+msgid "Change uploads folder?"
+msgstr "Измени пријемни директоријум?"
+
+#: lib/activation.php:113
+msgid "Update uploads folder?"
+msgstr "Запамти пријемни директоријум?"
+
+#: lib/activation.php:119
+msgid "Change uploads folder to /assets/ instead of /wp-content/uploads/"
+msgstr "Измени пријемни директоријум у /assets/ уместо /wp-content/uploads/"
+
+#: lib/activation.php:124 lib/activation.php:126
+msgid "Create navigation menu?"
+msgstr "Направи навигациони изборник?"
+
+#: lib/activation.php:132
+msgid "Create the Primary Navigation menu and set the location"
+msgstr "Направи Основни навигациони изборник и постави га?"
+
+#: lib/activation.php:137 lib/activation.php:139
+msgid "Add pages to menu?"
+msgstr "Додај стране у изборник?"
+
+#: lib/activation.php:145
+msgid "Add all current published pages to the Primary Navigation"
+msgstr "Додај све објављене стране у Основни навигациони изборник"
+
+#: lib/cleanup.php:382
+msgid "Continued"
+msgstr "Наставак"
+
+#: lib/init.php:11
+msgid "Primary Navigation"
+msgstr "Основна навигација"
+
+#: lib/utils.php:60
+msgid "Latest Posts"
+msgstr "Најновији чланци"
+
+#: lib/utils.php:69
+msgid "Daily Archives: %s"
+msgstr "Дневне архиве: %s"
+
+#: lib/utils.php:71
+msgid "Monthly Archives: %s"
+msgstr "Месечне архиве: %s"
+
+#: lib/utils.php:73
+msgid "Yearly Archives: %s"
+msgstr "Годишње архиве: %s"
+
+#: lib/utils.php:75
+msgid "Author Archives: %s"
+msgstr "Архиве аутора: %s"
+
+#: lib/utils.php:80
+msgid "Search Results for %s"
+msgstr "Резултати претраге за %s"
+
+#: lib/utils.php:82
+msgid "Not Found"
+msgstr "Нема резултата"
+
+#: lib/utils.php:94
+msgid "Please make sure your <a href=\"%s\">.htaccess</a> file is writable "
+msgstr ""
+"Проверите да ли је дозвољено писање у <a href=\"%s\">.htaccess</a> датотеку"
+
+#: lib/widgets.php:8
+msgid "Primary Sidebar"
+msgstr "Основна бочна трака"
+
+#: lib/widgets.php:17
+msgid "Footer"
+msgstr "Футер"
+
+#: lib/widgets.php:45
+msgid "Use this widget to add a vCard"
+msgstr "Употреби овај виџет за додавање vCard"
+
+#: lib/widgets.php:47
+msgid "Roots: vCard"
+msgstr "Корени: vCard"
+
+#: lib/widgets.php:74
+msgid "vCard"
+msgstr "vCard"
+
+#: templates/comment.php:4
+msgid "%1$s"
+msgstr "%1$s"
+
+#: templates/comment.php:5
+msgid "(Edit)"
+msgstr "(измени)"
+
+#: templates/comment.php:9
+msgid "Your comment is awaiting moderation."
+msgstr "Коментар чека одобрење."
+
+#: templates/comments.php:8
+msgid "One Response to &ldquo;%2$s&rdquo;"
+msgid_plural "%1$s Responses to &ldquo;%2$s&rdquo;"
+msgstr[0] "Један коментар на &ldquo;%2$s&rdquo;"
+msgstr[1] "%1$s коментара на &ldquo;%2$s&rdquo;"
+
+#: templates/comments.php:18
+msgid "&larr; Older comments"
+msgstr "&larr; Старији коментари"
+
+#: templates/comments.php:21
+msgid "Newer comments &rarr;"
+msgstr "Новији коментари &rarr;"
+
+#: templates/comments.php:29 templates/comments.php:38
+msgid "Comments are closed."
+msgstr "Коментарисање затворено."
+
+#: templates/comments.php:45
+msgid "Leave a Reply"
+msgstr "Остави коментар"
+
+#: templates/comments.php:45
+msgid "Leave a Reply to %s"
+msgstr "Остави коментар на %s"
+
+#: templates/comments.php:48
+msgid "You must be <a href=\"%s\">logged in</a> to post a comment."
+msgstr "Мораш бити <a href=\"%s\">пријављен</a> да би сте оставили коментар."
+
+#: templates/comments.php:53
+msgid "Logged in as <a href=\"%s/wp-admin/profile.php\">%s</a>."
+msgstr "Пријављен као <a href=\"%s/wp-admin/profile.php\">%s</a>."
+
+#: templates/comments.php:54
+msgid "Log out of this account"
+msgstr "Одјави се"
+
+#: templates/comments.php:54
+msgid "Log out &raquo;"
+msgstr "Одјава &raquo;"
+
+#: templates/comments.php:57
+msgid "Name"
+msgstr "Име"
+
+#: templates/comments.php:57 templates/comments.php:59
+msgid " (required)"
+msgstr " (обавезно)"
+
+#: templates/comments.php:59
+msgid "Email (will not be published)"
+msgstr "емеил адреса (неће бити објављена)"
+
+#: templates/comments.php:61
+msgid "Website"
+msgstr "Вебсајт"
+
+#: templates/comments.php:64
+msgid "Comment"
+msgstr "Коментар"
+
+#: templates/comments.php:66
+msgid "Submit Comment"
+msgstr "Пошаљи коментар"
+
+#: templates/content-single.php:11
+msgid "Pages:"
+msgstr "Стране:"
+
+#: templates/entry-meta.php:2
+msgid "By"
+msgstr "аутор"
+
+#: templates/searchform.php:2
+msgid "Search for:"
+msgstr "Потрага за:"
+
+#: templates/searchform.php:3 templates/searchform.php:4
+msgid "Search"
+msgstr "Потрага"

lib/activation.php

@@ -93,7 +93,7 @@ function roots_theme_activation_options_render_page() { ?>
                 <option value="false"><?php echo _e('No', 'roots'); ?></option>
               </select>
               <br>
-              <small class="description"><?php printf(__('Change uploads folder to /assets/ instead of /wp-content/uploads/', 'roots')); ?></small>
+              <small class="description"><?php printf(__('Change uploads folder to /media/ instead of /wp-content/uploads/', 'roots')); ?></small>
             </fieldset>
           </td>
         </tr>
@@ -191,7 +191,7 @@ function roots_theme_activation_action() {
 
     update_option('uploads_use_yearmonth_folders', 0);
     if (!is_multisite()) {
-      update_option('upload_path', 'assets');
+      update_option('upload_path', 'media');
     } else {
       update_option('upload_path', '');
     }

lib/cleanup.php

@@ -99,8 +99,8 @@ add_filter('wp_title', 'roots_wp_title', 10);
  */
 function roots_clean_style_tag($input) {
   preg_match_all("!<link rel='stylesheet'\s?(id='[^']+')?\s+href='(.*)' type='text/css' media='(.*)' />!", $input, $matches);
-  // Only display media if it's print
+  // Only display media if it is meaningful
-  $media = $matches[3][0] === 'print' ? ' media="print"' : '';
+  $media = $matches[3][0] !== '' && $matches[3][0] !== 'all' ? ' media="' . $matches[3][0] . '"' : '';
   return '<link rel="stylesheet" href="' . $matches[2][0] . '"' . $media . '>' . "\n";
 }
 add_filter('style_loader_tag', 'roots_clean_style_tag');
@@ -184,7 +184,6 @@ function roots_embed_wrap($cache, $url, $attr = '', $post_ID = '') {
   return '<div class="entry-content-asset">' . $cache . '</div>';
 }
 add_filter('embed_oembed_html', 'roots_embed_wrap', 10, 4);
-add_filter('embed_googlevideo', 'roots_embed_wrap', 10, 2);
 
 /**
  * Add class="thumbnail" to attachment items
@@ -379,61 +378,6 @@ function roots_remove_default_description($bloginfo) {
 }
 add_filter('get_bloginfo_rss', 'roots_remove_default_description');
 
-/**
- * Allow more tags in TinyMCE including <iframe> and <script>
- */
-function roots_change_mce_options($options) {
-  $ext = 'pre[id|name|class|style],iframe[align|longdesc|name|width|height|frameborder|scrolling|marginheight|marginwidth|src],script[charset|defer|language|src|type]';
-
-  if (isset($initArray['extended_valid_elements'])) {
-    $options['extended_valid_elements'] .= ',' . $ext;
-  } else {
-    $options['extended_valid_elements'] = $ext;
-  }
-
-  return $options;
-}
-add_filter('tiny_mce_before_init', 'roots_change_mce_options');
-
-/**
- * Add additional classes onto widgets
- *
- * @link http://wordpress.org/support/topic/how-to-first-and-last-css-classes-for-sidebar-widgets
- */
-function roots_widget_first_last_classes($params) {
-  global $my_widget_num;
-
-  $this_id = $params[0]['id'];
-  $arr_registered_widgets = wp_get_sidebars_widgets();
-
-  if (!$my_widget_num) {
-    $my_widget_num = array();
-  }
-
-  if (!isset($arr_registered_widgets[$this_id]) || !is_array($arr_registered_widgets[$this_id])) {
-    return $params;
-  }
-
-  if (isset($my_widget_num[$this_id])) {
-    $my_widget_num[$this_id] ++;
-  } else {
-    $my_widget_num[$this_id] = 1;
-  }
-
-  $class = 'class="widget-' . $my_widget_num[$this_id] . ' ';
-
-  if ($my_widget_num[$this_id] == 1) {
-    $class .= 'widget-first ';
-  } elseif ($my_widget_num[$this_id] == count($arr_registered_widgets[$this_id])) {
-    $class .= 'widget-last ';
-  }
-
-  $params[0]['before_widget'] = preg_replace('/class=\"/', "$class", $params[0]['before_widget'], 1);
-
-  return $params;
-}
-add_filter('dynamic_sidebar_params', 'roots_widget_first_last_classes');
-
 /**
  * Redirects search results from /?s=query to /search/query/, converts %20 to +
  *

lib/config.php

@@ -67,7 +67,7 @@ function roots_display_sidebar() {
     )
   );
 
-  return $sidebar_config->display;
+  return apply_filters('roots_display_sidebar', $sidebar_config->display);
 }
 
 /**

lib/init.php

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

lib/scripts.php

@@ -7,12 +7,12 @@
  * 2. /child-theme/style.css (if a child theme is activated)
  *
  * Enqueue scripts in the following order:
- * 1. jquery-1.9.1.min.js via Google CDN
+ * 1. jquery-1.10.1.min.js via Google CDN
  * 2. /theme/assets/js/vendor/modernizr-2.6.2.min.js
  * 3. /theme/assets/js/main.min.js (in footer)
  */
 function roots_scripts() {
-  wp_enqueue_style('roots_main', get_template_directory_uri() . '/assets/css/main.min.css', false, '8a868df86cb5fe3b8e0e33b67e537f34');
+  wp_enqueue_style('roots_main', get_template_directory_uri() . '/assets/css/main.min.css', false, '642fb47e4d0c5276c3ad6084dae68f1a');
 
   // Load style.css from child theme
   if (is_child_theme()) {
@@ -24,7 +24,7 @@ function roots_scripts() {
   // It's kept in the header instead of footer to avoid conflicts with plugins.
   if (!is_admin() && current_theme_supports('jquery-cdn')) {
     wp_deregister_script('jquery');
-    wp_register_script('jquery', '//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js', false, null, false);
+    wp_register_script('jquery', '//ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js', false, null, false);
     add_filter('script_loader_src', 'roots_jquery_local_fallback', 10, 2);
   }
 
@@ -33,7 +33,7 @@ function roots_scripts() {
   }
 
   wp_register_script('modernizr', get_template_directory_uri() . '/assets/js/vendor/modernizr-2.6.2.min.js', false, null, false);
-  wp_register_script('roots_scripts', get_template_directory_uri() . '/assets/js/scripts.min.js', false, '2889bb2f21e80b03b270797843bf4c2d', true);
+  wp_register_script('roots_scripts', get_template_directory_uri() . '/assets/js/scripts.min.js', false, '8b9f4205f4a36229fdc83067ea78e79e', true);
   wp_enqueue_script('modernizr');
   wp_enqueue_script('jquery');
   wp_enqueue_script('roots_scripts');
@@ -45,7 +45,7 @@ function roots_jquery_local_fallback($src, $handle) {
   static $add_jquery_fallback = false;
 
   if ($add_jquery_fallback) {
-    echo '<script>window.jQuery || document.write(\'<script src="' . get_template_directory_uri() . '/assets/js/vendor/jquery-1.9.1.min.js"><\/script>\')</script>' . "\n";
+    echo '<script>window.jQuery || document.write(\'<script src="' . get_template_directory_uri() . '/assets/js/vendor/jquery-1.10.1.min.js"><\/script>\')</script>' . "\n";
     $add_jquery_fallback = false;
   }
 
@@ -58,11 +58,14 @@ function roots_jquery_local_fallback($src, $handle) {
 
 function roots_google_analytics() { ?>
 <script>
-  var _gaq=[['_setAccount','<?php echo GOOGLE_ANALYTICS_ID; ?>'],['_trackPageview']];
+  (function(b,o,i,l,e,r){b.GoogleAnalyticsObject=l;b[l]||(b[l]=
-  (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
+  function(){(b[l].q=b[l].q||[]).push(arguments)});b[l].l=+new Date;
-    g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
+  e=o.createElement(i);r=o.getElementsByTagName(i)[0];
-    s.parentNode.insertBefore(g,s)}(document,'script'));
+  e.src='//www.google-analytics.com/analytics.js';
+  r.parentNode.insertBefore(e,r)}(window,document,'script','ga'));
+  ga('create','<?php echo GOOGLE_ANALYTICS_ID; ?>');ga('send','pageview');
 </script>
+
 <?php }
 if (GOOGLE_ANALYTICS_ID) {
   add_action('wp_footer', 'roots_google_analytics', 20);

lib/utils.php

@@ -34,6 +34,7 @@ class Roots_Wrapping {
       array_unshift($templates, sprintf('base-%s.php', self::$base));
     }
 
+    $templates = apply_filters('roots_wrap_base', $templates);
     return locate_template($templates);
   }
 
@@ -44,6 +45,7 @@ class Roots_Wrapping {
       array_unshift($templates, sprintf('templates/sidebar-%s.php', self::$base));
     }
 
+    $templates = apply_filters('roots_wrap_sidebar', $templates);
     return locate_template($templates);
   }
 }
@@ -72,7 +74,8 @@ function roots_title() {
     } elseif (is_year()) {
       printf(__('Yearly Archives: %s', 'roots'), get_the_date('Y'));
     } elseif (is_author()) {
-      printf(__('Author Archives: %s', 'roots'), get_the_author());
+      $author = get_queried_object();
+      printf(__('Author Archives: %s', 'roots'), $author->display_name);
     } else {
       single_cat_title();
     }

templates/content-single.php

@@ -9,7 +9,6 @@
     </div>
     <footer>
       <?php wp_link_pages(array('before' => '<nav class="page-nav"><p>' . __('Pages:', 'roots'), 'after' => '</p></nav>')); ?>
-      <?php the_tags('<ul class="entry-tags"><li>','</li><li>','</li></ul>'); ?>
     </footer>
     <?php comments_template('/templates/comments.php'); ?>
   </article>

templates/content.php

@@ -6,7 +6,4 @@
   <div class="entry-summary">
     <?php the_excerpt(); ?>
   </div>
-  <footer>
-    <?php the_tags('<ul class="entry-tags"><li>','</li><li>','</li></ul>'); ?>
-  </footer>
 </article>