Revert "Merge pull request #1 from pagelines/master"

This reverts commit 16a1252, reversing
changes made to 09e4f7d.

README.md

@@ -4,28 +4,25 @@
 
 <h2>Getting Started</h2>
 
-<p>There are a few ways to quickly get started with DMS, you can download the free version available via the <a href="http://www.pagelines.com/" target="_blank">PageLines.com</a>, if you're feeling brave, you can use the bleeding edge version available via GitHub or purchase the premium version of DMS, which provides additional options and functionality.</p>
+<p>There are a few ways to quickly get started with DMS, you can download the open source version  available via GitHub, to see if the product meets your requirements or go straight ahead and purchase the professional version which provides additional options and functionality.</p>
 
-<h3>Free Version</h3>
+<h3>Open Source</h3>
 
-<p>DMS is open source and can be downloaded freely from <a href="http://www.pagelines.com/" target="_blank">PageLines.com</a>, simply sign up using the <strong>Get DMS now. It's free!</strong> button and follow the instructions.
+<p>DMS is open source and hosted on GitHub. This means you’ll have a collaborative codebase which gives you the ability to access latest changes, file issues, and contribute to the source.</p>
 
-<p><a class="btn btn-link" href="https://www.pagelines.com" target="_blank">Download DMS</a></p>
-
-
-<h3>Bleeding Edge</h3>
-
-<p>DMS can also be found on GitHub. However, this is the "bleeding edge" version. This branch is likely to be broken and buggy, but can be useful for testing new features and finding potential bugs.
-
-Having DMS on GitHub means you’ll have a collaborative codebase which gives you the ability to access latest changes, file issues, and contribute to the source.</p>
-
-<p><a class="btn btn-link" href="https://github.com/pagelines/DMS/archive/Dev.zip" target="_blank">Download Bleedy Edge</a></p>
+<div class="row-fluid">
+	<div class="span12">
+		<h4>Download Compiled</h4>
+		<p>Fastest way to get started is by downloading the compiled version which comes in .zip format.</p>
+		<p><a class="btn btn-default btn-primary" href="https://github.com/pagelines/DMS/archive/Dev.zip" "target="_blank""><i class="icon-github-alt"></i> Download DMS</a></p>
+	</div>
+</div>
 
 <h3>Professional Edition</h3>
 
 <p>As well as being open source and hosted on GitHub. We have also developed a professional edition, which included extra options and added functionality such as viewpoint animation.</p>
 
-<p><a class="btn btn-link" href="http://www.pagelines.com/pricing/" target="_blank">Purchase DMS now!</a></p>
+<p><a class="btn btn-default btn-success" href="http://www.pagelines.com/pricing/" "target="_blank"">Purchase DMS now!</a></p>
 
 
 <h2>Quick Links</h2>
@@ -47,9 +44,9 @@ Having DMS on GitHub means you’ll have a collaborative codebase which gives yo
 		<ul>
 			<li><a href="http://www.pagelines.com/forum/">Forum</a></li>
 			<li><a href="http://www.pagelines.com/contact/">Helpdesk</a></li>
+			<li><a href="http://www.pagelines.com/pros/">PageLines Pros</a></li>
 			<li><a href="http://pagelines.com/translate/projects/">Translation Center</a></li>
 			<li><a href="https://github.com/pagelines/DMS/issues">Issue Tracker</a></li>
-			<li><a href="http://docs.pagelines.com/changelog">DMS Changelog</a></li>
 		</ul>
 	</div>
 </div>
@@ -58,4 +55,4 @@ Having DMS on GitHub means you’ll have a collaborative codebase which gives yo
 
 <p>The PageLines DMS documentation is hosted on GitHub, this means our documentation is open to the public. Anyone who has a GitHub account can contribute to improving our documentation, this includes correcting any errors or creating your own docs to assist other PageLines DMS users.</p>
 
-<p><a class="btn btn-link" href="https://github.com/pagelines/Docs/" target="_blank">Contribute</a></p>
+<p><a class="btn btn-default btn-primary" href="https://github.com/pagelines/Docs/" target="_blank"><i class="icon-github-alt"></i> Contribute</a></p>

advanced/custom-sidebars.md

@@ -12,20 +12,21 @@
 
 There are times when default sidebars just aren't enough.  So, DMS makes it incredibly easy to add new ones.
 
-To create custom sidebars in DMS, you simply need the Sidebar Manager Light
- plugin, available at [http://wordpress.org/plugins/sidebar-manager-light/](http://wordpress.org/plugins/sidebar-manager-light/).
+To create custom sidebars in DMS, you simply need the Custom Sidebars plugin, available at [http://wordpress.org/plugins/custom-sidebars/](http://wordpress.org/plugins/custom-sidebars/).
+
+![](https://raw.github.com/pagelines/Docs/master/gh-pages-template/public/img/custom-sidebars-plugin.png)
 
 The plugin will facilitate your creation of customized sidebars that will work with all widgetized sections such as **Columizer**, **Primary Sidebar** and **Widgetizer**.
 
 ## Creating Custom Sidebars ##
 
-Once the plugin has been installed, navigate to **Wordpress Administrator Dashboard → Sidebar Manager → Add Sidebar** and choose a name and description for your new sidebar. Save your changes and the sidebar will appear **Appearance → Widgets**.
+Once the plugin has been installed, navigate to **Appearance → Custom Sidebars** and choose a name and description for your new sidebar. Save your changes and the sidebar will appear **Appearance → Widgets**.
 
-![](https://raw.github.com/pagelines/Docs/master/gh-pages-template/public/img/customsidebar.jpg)
+![](https://raw.github.com/pagelines/Docs/master/gh-pages-template/public/img/custom-sidebars-plugin2.png)
 
 You will now be able to add widgets to your custom sidebar.
 
-![](https://raw.github.com/pagelines/Docs/master/gh-pages-template/public/img/customsidebar2.jpg)
+![](https://raw.github.com/pagelines/Docs/master/gh-pages-template/public/img/custom-sidebars-plugin3.png)
 
 You can assign your custom sidebars by dragging and dropping one of the widgetized sections such as **Columizer**, **Primary Sidebar** and **Widgetizer** to your template and configure the section using the drop down menu to select your custom sidebar.
 
@@ -38,4 +39,4 @@ You can assign your custom sidebars by dragging and dropping one of the widgetiz
   			<li class="pull-right"><a href="http://docs.pagelines.com/advanced/translating-dms">Translating DMS &rarr;</i></a></li>
 		</ul>
 	</div>
-</div>
+</div>

advanced/less-css.md

@@ -735,7 +735,7 @@ By using the the LESS mixins`.border-radius();` and `#gradient > .vertical()`, w
 #site .masthead {
 	#gradient > .vertical(#05F, #09F);
 	.border-radius(8px);
-	padding: 20px;
+	padding: 20px
 }
 ~~~
 
@@ -770,4 +770,4 @@ As you can see, with just three lines of LESS CSS, we have created a browser com
   			<li class="pull-right"><a href="http://docs.pagelines.com/advanced/override-sections">Override Sections &rarr;</i></a></li>
 		</ul>
 	</div>
-</div>
+</div>

advanced/optimize-load-time.md

@@ -49,13 +49,11 @@ In modern web development even minor optimizations have significant influence on
 
 Fortunately, there is an amazing, free plugin called [WP-SmushIt](http://wordpress.org/plugins/wp-smushit/) which will do this process to all of your images automatically, as you are uploading them.
 
-Another alternative is [Kracken](http://kraken.io/), Kraken is a robust, ultra-fast image optimizer.
-
 ## LazyLoad ##
 
 LazyLoad is the process of delaying the loading of images in long web pages. Images outside of viewport (visible part of web page) wont be loaded before user scrolls to them.
 
-PageLines have a free plugin available on the store called [Lazy Load](http://wordpress.org/plugins/lazy-load/)
+PageLines have a free plugin available on the store called [LazyLoader](http://www.pagelines.com/store/plugins/pagelines-lazyloader/)
 
 ## Revision Control ##
 
@@ -69,4 +67,4 @@ Installing the [Revision Control](http://wordpress.org/plugins/revision-control/
 			<li class="pull-left"><a href="http://docs.pagelines.com/advanced/custom-sidebars">&larr; Custom Sidebars</a></li>
   		</ul>
 	</div>
-</div>
+</div>

advanced/override-sections.md

@@ -18,14 +18,14 @@ To begin, let's make sure we are using the **Base Theme** customization method,
 
 ![](https://raw.github.com/pagelines/Docs/master/gh-pages-template/public/img/base-theme-active.jpg)
 
-Once we have determined that the **Base Theme** is our customization method, we need to download a fresh copy of DMS from your [PageLines Account](http://www.pagelines.com/my-account) . Once downloaded, extract the `dms.zip` and navigate to **pagelines → sections**, here you will find multiple folders each representing the core sections included with PageLines DMS.
+Once we have determined that the **Base Theme** is our customization method, we need to download a fresh copy of DMS from the [PageLines Launchpad](http://www.pagelines.com/launchpad/member.php) . Once downloaded, extract the `pagelines.zip` and navigate to **pagelines → sections**, here you will find multiple folders each representing the core sections included with PageLines DMS.
 
-Locate the section in which you wish to override or customize, for this example we will be overriding the **iBox** section. Now open your FTP client, connect to your server and navigate to the following directory: `/wp-content/themes/dms-template-theme/sections/`.
+Locate the section in which you wish to override or customize, for this example we will be overriding the **iBox** section. Now open your FTP client, connect to your server and navigate to the following directory: `/wp-content/themes/pagelines-template-theme/sections/`.
 
-Upload the **iBox** section folder to Base Theme at `/wp-content/themes/dms-template-theme/sections/`  as a folder and like magic, we have a child section of iBox, ready for us to modify.
+Upload the **iBox** section folder to Base Theme at `/wp-content/themes/pagelines-template-theme/sections/`  as a folder and like magic, we have a child section of iBox, ready for us to modify.
 
 <pre>
-<i class="icon-folder-open"></i> dms-template-theme/
+<i class="icon-folder-open"></i> pagelines-template-theme/
 	<i class="icon-folder-open"></i> sections/
 		<i class="icon-folder-open"></i> <strong>ibox/</strong>
 	<i class="icon-file"></i> functions.php
@@ -50,4 +50,4 @@ Please be aware that our support team will be able to provide limited support fo
   			<li class="pull-right"><a href="http://docs.pagelines.com/advanced/custom-sidebars">Custom Sidebars &rarr;</i></a></li>
 		</ul>
 	</div>
-</div>
+</div>

advanced/translating-dms.md

@@ -22,7 +22,9 @@ define ('WPLANG', 'da_DK');
 
 ## Update Safe ##
 
-By using either the **Base Theme** or **PageLines Customize Plugin** and creating a `language` folder, your custom translations will be safe from updates. Create the `language` folder in the following location.
+PageLines DMS includes a `language` folder containing the `pagelines.pot`, which can be used to manually create your custom translations. If you add your custom translations to this language folder, they can be lost when updating.
+
+However, by using either the **Base Theme** or **PageLines Customize Plugin** and creating a `language` folder, your custom translations will be safe from updates. Create the `language` folder in the following location.
 
 ### PageLines Customize Plugin ###
 
@@ -60,11 +62,13 @@ Once uploaded, your file structure for the Base Theme will look like this:
 
 ## PoEdit ##
 
-If you wish to add translations manually, you can do so by using [PoEdit](http://www.poedit.net/).
+We offer a community-driven [Translation center](http://www.pagelines.com/translate/projects) for PageLines and welcome you to sign-up and help translate. If your language is not listed, please [let us know](mailto:[email protected]) and we can add it for you.
+
+Alternatively, if you wish to add translations manually, you can do so by using [PoEdit](http://www.poedit.net/).
 
 PageLines DMS includes one `.pot` file which can be imported into PoEdit to translate. To get started open PoEdit and go to **File → New catalog from POT file**.
 
-Once you have done this, choose the **pagelines.pot** which is located in `/wp-content/themes/dms/language/` and PoEdit will show the catalog properties window.
+Once you have done this, choose the **pagelines.pot** which is located in `/wp-content/themes/pagelines/language/` and PoEdit will show the catalog properties window.
 
 ![](https://raw.github.com/pagelines/Docs/master/gh-pages-template/public/img/catalog-property-window.jpg)
 

configure/global-options.md

@@ -10,7 +10,7 @@
 
 # Options #
 
-PageLines DMS provides users with a number of global settings, allowing them to change their site's layout, add social integration, control colors, styles and more.
+PageLines DMS provides users with a number of global settings, allowing them to change their site's layout, add social intergration, control colors, styles and more.
 
 ## Site Images ##
 
@@ -114,8 +114,6 @@ Enter the required information for either twitter, facebook or hashtag into the
 
 ![Section Control](https://raw.github.com/pagelines/Docs/master/gh-pages-template/public/img/social-local.jpg "Social Media")
 
-**Note:** Using the adblock plus extension will hide all options please disable or make an exception for your site.
-
 ## NavBar ##
 
 The **NavBar** panel provides the ability to enable a fixed navigation bar to the top of your website. This Fixed Navigation bar is a powerful way to maintain your brand and menu even as your visitor’s scroll through your content.
@@ -169,18 +167,6 @@ The **Advanced** panel contains some additional options that can be useful to so
 
 Checking this box will enable a class of `prettyprint` to `<code>` or `<pre>` tags, or optionally use the `[pl_codebox]` shortcode. Wrap the codebox shortcode using `[pl_raw]` if Wordpress inserts line breaks.
 
-Google Prettify is a Javascript module and CSS file that allows syntax highlighting of source code snippets in an html page.
-
-##### Example #####
-
-~~~ .css
-.example {
-	background-color: #0088DD;
-	color: #FFFFFF;
-	padding: 40px;
-}
-~~~
-
 #### PageLines Affiliate/Partner Link ####
 
 If you are a [PageLines Partner](http://www.pagelines.com/partners/) you can enter your Partner Link here to change the PageLines logo on your site to be an affiliate link.

configure/pagelines-store.md

@@ -16,7 +16,7 @@ The Store is an incredible asset, full of important resources to improve the qua
 
 ## Accessing the store ##
 
-To access the Store, you may purchase direct from our [website](http://www.pagelines.com/shop) or, for easier installation, simply access the Store tab from the PageLines Toolbar to find the products you need.
+To access the Store, you may purchase direct from our [website](http://www.pagelines.com/store) or, for easier installation, simply access the Store tab from the PageLines Toolbar to find the products you need.
 
 ![](https://raw.github.com/pagelines/Docs/master/gh-pages-template/public/img/store.jpg)
 
@@ -48,4 +48,4 @@ Themes purchased through the PageLines Store are installed like any other Wordpr
 			<li class="pull-left"><a href="http://docs.pagelines.com/configure/global-options">&larr; Global Options</a></li>
   		</ul>
 	</div>
-</div>
+</div>