From 342765f940e317d84d64668668bc6b7bf595daf0 Mon Sep 17 00:00:00 2001 From: David Resseguie Date: Wed, 24 Apr 2013 11:24:52 -0400 Subject: [PATCH] Refactor HTML/layout from pods folder to themes Took advantage of Stack header/footer functionality to move wrapper HTML into themes folder. For non-Stack output, created appropriate new theme file. --- pods/core_feeds/list.php | 16 ++------- pods/core_groups/index.php | 15 ++------ pods/core_invite/index.php | 38 ++------------------ pods/core_usercontent/list.php | 20 +++-------- themes/default/groups/invite.php | 48 +++++++++++++++++++++++++ themes/default/stacks/2col_footer.php | 38 ++++++++++++++++++++ themes/default/stacks/2col_header.php | 26 ++++++++++++++ themes/default/stacks/2col_pager.php | 42 ++++++++++++++++++++++ themes/default/stacks/groups_footer.php | 28 --------------- themes/default/stacks/groups_header.php | 23 ------------ themes/default/stacks/groups_pager.php | 38 ++++++++++++++++++++ 11 files changed, 202 insertions(+), 130 deletions(-) create mode 100644 themes/default/groups/invite.php create mode 100644 themes/default/stacks/2col_footer.php create mode 100644 themes/default/stacks/2col_header.php create mode 100644 themes/default/stacks/2col_pager.php delete mode 100644 themes/default/stacks/groups_footer.php delete mode 100644 themes/default/stacks/groups_header.php create mode 100644 themes/default/stacks/groups_pager.php diff --git a/pods/core_feeds/list.php b/pods/core_feeds/list.php index 4b781d1..bf8c7e1 100644 --- a/pods/core_feeds/list.php +++ b/pods/core_feeds/list.php @@ -137,23 +137,11 @@ $description = "$scope $type " . implode(" and ",$conditions); $feedurl = $POD->siteRoot(false) . '/feeds/' . $_GET['args']; + $POD->header($description,$feedurl); - ?> - -
- output('short','header','pager',$description); ?> -
-
- output('sidebars/search'); ?> - - output('sidebars/ad_unit'); ?> - output('sidebars/tag_cloud'); ?> + $docs->output('short','2col_header','2col_pager',$description); - output('sidebars/recent_visitors'); ?> - -
-footer(); ?> \ No newline at end of file diff --git a/pods/core_groups/index.php b/pods/core_groups/index.php index 277e293..18e56a8 100644 --- a/pods/core_groups/index.php +++ b/pods/core_groups/index.php @@ -65,17 +65,6 @@ $POD->header('My Groups'); - ?> -
- output('short','header','pager',$header,'No groups have been created'); ?> -
+ $groups->output('short','2col_header','groups_pager',$header,'No groups have been created'); -
- - output('sidebars/group_search'); ?> - output('sidebars/create_group'); ?> - output('sidebars/recent_groups'); ?> - -
- -footer(); ?> + $POD->footer(); ?> diff --git a/pods/core_invite/index.php b/pods/core_invite/index.php index 479067c..e458c69 100644 --- a/pods/core_invite/index.php +++ b/pods/core_invite/index.php @@ -32,39 +32,5 @@ } $POD->header('Send Invites'); - ?> -
- - -
- -

Send Invites

- -

-

-

-

-

- - -
-
- getGroup(array('id'=>$_GET['group'])); - if ($group->success() && $group->isMember($POD->currentUser())) { ?> -
- Your email will include an invitation to join permalink(); ?>. -
- - - - -

- -

-
- -
-footer(); ?> + $POD->output('groups/invite'); + $POD->footer(); ?> diff --git a/pods/core_usercontent/list.php b/pods/core_usercontent/list.php index 2626397..b2b04a9 100644 --- a/pods/core_usercontent/list.php +++ b/pods/core_usercontent/list.php @@ -26,21 +26,9 @@ } $docs = $POD->getContents(array('type'=>$content_type,'status:!='=>'friends_only'),null,30,$offset); - $POD->header('What\'s New?'); ?> + $POD->header('What\'s New?'); -
- output('short','header','pager','What\'s New?','Nothing has been posted on this site yet. Wow, it must be brand new!'); ?> -
-
- - output('sidebars/search'); ?> + $docs->output('short','2col_header','2col_pager','What\'s New?','Nothing has been posted on this site yet. Wow, it must be brand new!'); - output('sidebars/ad_unit'); ?> - - output('sidebars/tag_cloud'); ?> - - output('sidebars/recent_visitors'); ?> - -
- -footer(); ?> + $POD->footer(); +?> diff --git a/themes/default/groups/invite.php b/themes/default/groups/invite.php new file mode 100644 index 0000000..5422cba --- /dev/null +++ b/themes/default/groups/invite.php @@ -0,0 +1,48 @@ + +
+ + +
+ +

Send Invites

+ +

+

+

+

+

+ + +
+
+ getGroup(array('id'=>$_GET['group'])); + if ($group->success() && $group->isMember($POD->currentUser())) { ?> +
+ Your email will include an invitation to join permalink(); ?>. +
+ + + + +

+ +

+
+ +
\ No newline at end of file diff --git a/themes/default/stacks/2col_footer.php b/themes/default/stacks/2col_footer.php new file mode 100644 index 0000000..f6b345e --- /dev/null +++ b/themes/default/stacks/2col_footer.php @@ -0,0 +1,38 @@ + + count() == 0) { ?> +
  • + + Nothing to show! + +
    • + + + + + +
    + + output('sidebars/search'); ?> + + output('sidebars/ad_unit'); ?> + + output('sidebars/tag_cloud'); ?> + + output('sidebars/recent_visitors'); ?> + +
    \ No newline at end of file diff --git a/themes/default/stacks/2col_header.php b/themes/default/stacks/2col_header.php new file mode 100644 index 0000000..88b2a66 --- /dev/null +++ b/themes/default/stacks/2col_header.php @@ -0,0 +1,26 @@ + +
    + +
    +
      + +
    • +
      +

      +
      +
      • + + \ No newline at end of file diff --git a/themes/default/stacks/2col_pager.php b/themes/default/stacks/2col_pager.php new file mode 100644 index 0000000..7107006 --- /dev/null +++ b/themes/default/stacks/2col_pager.php @@ -0,0 +1,42 @@ + + count() == 0) { ?> +
    • + + Nothing to show! + +
      • + +
    • + hasPreviousPage()) { echo ''; } ?> + hasNextPage()) { echo ''; } ?> +
      • +
    +
    +
    + +
    + + output('sidebars/search'); ?> + + output('sidebars/ad_unit'); ?> + + output('sidebars/tag_cloud'); ?> + + output('sidebars/recent_visitors'); ?> + +
    \ No newline at end of file diff --git a/themes/default/stacks/groups_footer.php b/themes/default/stacks/groups_footer.php deleted file mode 100644 index 6892095..0000000 --- a/themes/default/stacks/groups_footer.php +++ /dev/null @@ -1,28 +0,0 @@ - -count() == 0) { ?> -
  • - - No groups found. - -
    • - -
  • - hasPreviousPage()) { echo ''; } ?> - hasNextPage()) { echo ''; } ?> -
    • - - \ No newline at end of file diff --git a/themes/default/stacks/groups_header.php b/themes/default/stacks/groups_header.php deleted file mode 100644 index 6b27f2c..0000000 --- a/themes/default/stacks/groups_header.php +++ /dev/null @@ -1,23 +0,0 @@ - - -
    - +
    + + +
    + + output('sidebars/group_search'); ?> + output('sidebars/create_group'); ?> + output('sidebars/recent_groups'); ?> + +
    \ No newline at end of file