General updates

volcanicpixels · Jul 25, 2012 · 34cfea4 · 34cfea4
1 parent 855bddf
commit 34cfea4
Show file tree

Hide file tree

Showing 12 changed files with 142 additions and 6 deletions.
diff --git a/lava b/lava
diff --git a/plugin.php b/plugin.php
@@ -17,16 +17,56 @@ class Volcanic_Pixels_Private_Blog extends Lava_Plugin {
 	public $_plugin_name = "Private Blog";
 	public $_plugin_version = 4.05;
 
+	public $_plugin_actions = array(
+		'do_authentication',
+		'do_login_display'
+	);
+
+	public $_plugin_filters = array(
+		'is_authorised'
+	);
+
+	###########################################
+	##	lava hooks
+	###########################################
+
 	function _init() {
 		parent::_init();
 	}
 
-	function _register_settings() {
-		parent::_register_settings();
+	function _get_header() {
+		$this->_do_plugin_action( 'do_authentication' );
 	}
 
-	function _register_pages() {
-		parent::_register_pages();
+	function _register_widgets() {
+		die('asd');
+	}
+
+	###########################################
+	##	lava hooks
+	###########################################
+
+	/*
+		Plugin hooks
+	*/
+	function do_authentication() {
+		$is_authorised = $this->_apply_plugin_filters( 'is_authorised', false );
+		if( ! $is_authorised ) {
+			$this->_do_plugin_action( 'do_login_display' );
+			exit; //better to be safe
+		}
+	}
+
+	function is_authorised( $current ) {
+		return false;
+	}
+
+
+	/*
+		Displays the login page
+	*/
+	function do_login_display() {
+		$this->_skins()->_display_template( 'login' );
 	}
 }
 

diff --git a/skins/default/images/logo.png b/skins/default/images/logo.png
diff --git a/skins/default/settings.yaml b/skins/default/settings.yaml
@@ -0,0 +1,8 @@
+#
+#	settings.yaml contains the setting definitions in a nice human-readable format
+#
+
+logo:
+  type: image
+  default: /images/logo.png
+  get_url: true # this automatically changes the default value into an absolute url
diff --git a/skins/default/styles.css b/skins/default/styles.css
diff --git a/skins/default/styles.less b/skins/default/styles.less
@@ -0,0 +1,30 @@
+@import "../../lava/assets/less/mixins.less";
+
+body {
+	background: #fefefe;
+}
+
+#logo{
+	background-repeat: no-repeat;
+	background-position: bottom center;
+	min-height: 100px;
+	max-height: 500px;
+
+	img {
+		margin-left: -1000px;
+		opacity: 0;
+		z-index: -1;
+	}
+}
+
+#login_form_cntr {
+	margin-left: auto;
+	margin-right: auto;
+	background: white;
+	border: 1px solid #BEBEBE;
+	width: 300px;
+	padding: 20px;
+
+	.box-shadow(0 1px 3px rgba(0, 0, 0, 0.2) );
+	.border-radius( 3px );
+}
diff --git a/skins/default/templates/login.html b/skins/default/templates/login.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta charset="utf-8" />
+		<title>{{ get_bloginfo( 'name' ) }} | Login</title>
+		{{ head() }}
+		{{ styles() }}
+		<style type="text/css">
+			#logo {
+				background-image:url({{ logo }});
+			}
+		</style>
+		{{ scripts() }}
+	</head>
+	<body class="" >
+		<div id="logo">
+			{# The logo is actually displayed using the background-image but this is used to make sure the height is correct #}
+			<img src="{{ logo }}" />
+		</div>
+		<div id="login_form_cntr">
+			<form id="login_form" method="post">
+				{{ widget( 'form' ) }}
+			</form>
+		</div>
+	</body>
+</html>
diff --git a/skins/spec.txt b/skins/spec.txt
@@ -0,0 +1,3 @@
+This file outlines the guidelines that all skins should follow to ensure compatibility with extensions.
+
+The login form should have the id login_form
diff --git a/skins/stacked/settings.yaml b/skins/stacked/settings.yaml
diff --git a/skins/stacked/templates/login.html b/skins/stacked/templates/login.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		{{ watermark }}
+		<meta charset="utf-8" />
+		<title>{{ environment.blog_name }} | Login</title>
+		<link rel="stylesheet" type="text/css" href="{{ environment.static_url }}/styles.css" />
+	</head>
+	<body class="{{ body_class }}" >
+	</body>
+</html>
diff --git a/skins/stacked/thumb.jpg b/skins/stacked/thumb.jpg
diff --git a/vendor.php b/vendor.php
@@ -6,10 +6,27 @@
 Add licensing to bar
 
 */
-class Volcanic_Pixels_Private_Blog_Vendor extends Lava_Extension {
+class Volcanic_Pixels_Private_Blog_Vendor extends Lava_Vendor {
 
 	public $apiVersion = 1;
 
+	function _construct() {
+		parent::_construct( dirname(__file__), 'vendor' );
+	}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 	function init() {
 		$this->registerLicensingSettings();
 	}
+0 −0		assets/coffee/lava/_general/animations.coffee
+0 −0		assets/coffee/lava/_general/html5-history.coffee
+0 −0		assets/coffee/lava/_general/navigation.coffee
+0 −0		assets/coffee/lava/_general/scenes.coffee
+0 −0		assets/coffee/lava/_general/scenes.settings.coffee
+0 −0		assets/coffee/lava/_general/test.coffee
+0 −0		assets/coffee/lava/_polyfills/formattribute.coffee
+0 −0		assets/coffee/lava/_polyfills/image-label-fix.coffee
+108 −108		assets/js/lava.js
+20 −7		assets/lava.css
+2 −3		assets/less/design.less
+18 −4		assets/less/structure.css
+36 −2		assets/less/structure.less
+13 −0		classes/debug.php
+105 −6		classes/extensions/lava-extension.php
+18 −0		classes/extensions/lava-vendor.php
+60 −2		classes/lava-base.php
+12 −5		classes/lava-functions.php
+35 −1		classes/lava-plugin.php
+1 −0		classes/pages/lava-settings-page.php
+14 −0		classes/settings/lava-image-setting.php
+18 −11		classes/settings/lava-setting.php
+18 −0		classes/settings/lava-settings.php
+117 −0		classes/skins/lava-skin.php
+62 −6		classes/skins/lava-skins.php
+1 −1		templates/default/settings/default.twig
+1 −0		templates/default/settings/image.twig
+10 −1		templates/default/settings/skin.twig
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		This file outlines the guidelines that all skins should follow to ensure compatibility with extensions.

		The login form should have the id login_form