Skip to content

Commit

Permalink
Merge branch 'Dev' of github.com:pagelines/framework into Dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Simon Prosser committed Jul 9, 2013
2 parents 839c6db + ee37880 commit fd02be6
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 4 deletions.
31 changes: 28 additions & 3 deletions editor/editor.handler.php
Original file line number Diff line number Diff line change
Expand Up @@ -620,10 +620,35 @@ function process_head(){

$s->section_head( $meta['clone'] );

$head = ob_get_clean();
$out = ob_get_clean();

if($head != '')
echo pl_source_comment($s->name.' | Section Head') . $head;
if($out != '')
echo pl_source_comment($s->name.' | Section Head') . $out;


}
}
}

function process_foot(){


foreach($this->section_list as $key => $meta){

if( $this->in_factory( $meta['object'] ) ){

$s = $this->factory[ $meta['object'] ];

$s->meta = $meta;

ob_start();

$s->section_foot( );

$out = ob_get_clean();

if($out != '')
echo pl_source_comment($s->name.' | Section Foot') . $out;


}
Expand Down
6 changes: 6 additions & 0 deletions editor/editor.init.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ function __construct() {

add_action('wp_enqueue_scripts', array(&$this, 'process_styles' ));
add_action( 'wp_head', array(&$this, 'process_head' ) );
add_action( 'wp_footer', array(&$this, 'process_foot' ) );

// RENDER ACTIONS
add_action( 'pagelines_header', array(&$this, 'process_header' ) );
Expand Down Expand Up @@ -175,6 +176,11 @@ function process_head(){

$this->handler->process_head();
}

function process_foot(){

$this->handler->process_foot();
}

function process_header(){
$this->handler->process_region('header');
Expand Down
8 changes: 8 additions & 0 deletions includes/class.sections.php
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,14 @@ function section_admin(){}
* @since ...
*/
function section_head(){}

/**
* Section Foot
*
* Code added in this function will be run during the wp_footer hook
*
*/
function section_foot(){}


/**
Expand Down
5 changes: 4 additions & 1 deletion less/pl-editor.less
Original file line number Diff line number Diff line change
Expand Up @@ -980,7 +980,7 @@
overflow-y:scroll;
font-weight: 800;
font-size: 1em;

lh{
color: #889cb4;
text-shadow: 0 1px 0 rgba(255,255,255,.6);
Expand Down Expand Up @@ -1019,6 +1019,9 @@
font-size: .8em;
}
}
&:last-child{
margin-bottom: 20px;
}

&.ui-state-active a{
.buttonBackground(@btnPrimaryBackground, @btnPrimaryBackgroundHighlight);
Expand Down

0 comments on commit fd02be6

Please sign in to comment.