edge_framework 2.1.0 → 2.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTQ5MDVlZmU1M2FhODJhYTMwMzg5ZjE0ZmM4MzFlMGY3Y2Y4MDhmYQ==
+    ODI5ODlhZTk1ZjgxZTgyYzE3Y2RkZDZiM2U5MGQ1MmE5OTJlYTRlNw==
   data.tar.gz: !binary |-
-    Yzg4M2M2MTJmOTFjMWJjOTlkMjYxM2Y5NmQyYzllM2NmYmFiODQ2Mw==
+    Mjg1NDk5MTljYzRhZDZmMWI5OTNjNjZjMmYxN2RjMGJmZTRhZTE2OQ==
 SHA512:
   metadata.gz: !binary |-
-    YzEyNTVlNDYzNTZmMTU3NjZlMjQzYTVkYmMxMDM0YWViNTc2NGRhOTRiMDVm
-    ODYxMmIwYzhjNzg1ZmE4NTlhZjc3ZDk3ODYxODM0NDU2NDY4MWM0YjhkZTBj
-    Y2JiMTkyMTllN2NlZGQzZjQ4MmYzMTdkM2NmMDk2MGZjMDYzY2Q=
+    YTk1ZGI5YThmZTA2MDk3OGRlY2MxNjgzODU1MGI2YTgyMDQ2YjdlNTk1NmIw
+    OTQ5MmY2YzZmMGNiMTE0YjgyNGQ4Yjk2Mzc4NzlhYWQwMzU4MWQ5OTc1OTgy
+    OGUwMGQ2N2NiMTVlMjQ1ZDM4NTEzYWNhZjA4YzllZDZhYTc3MDk=
   data.tar.gz: !binary |-
-    NWJlNDBiMWYwMDEzZmQ1NGNiMzNhN2M3ZDY3NTQzZDk5YjAyYzY4ZDU4NzRj
-    ODcxOGIwZTZmMzRlYjYyOGNkZTkyYjQ3MjE0ZDA2Y2E3YzgzYWQ3NDdhZGY3
-    NjUzNjcxNDYwNjljNWUzNmY5N2Q1NjQ3YjYxZjk1OGY2MTJlZDA=
+    NDFiMmUyMmMwZjA3NGYzNjFiNzAwNDk2MTBhNDVmZjAzYWMwODQ2YmFmYWY5
+    NjliYmE0N2EyNTBlYzZmNjM5OGM4ZmM2NTgxOWQ2N2E2Y2M3YmNkY2Q3ZTk1
+    MzNmOTVmZTc0MzRkNTYwZDYwYmJhOTY2YjA0NmRlZmViMjZiMWQ=

data/README.md

@@ -180,29 +180,37 @@ WORDPRESS
 
 ![Edge Wordpress](http://cdn.setyono.net/edge/wp-edge.jpg)
 
-Our WordPress template requires [Timber](http://upstatement.com/timber/). It is a template engine that separates PHP and HTML into their own file.
+Our WordPress template requires [Timber](https://wordpress.org/plugins/timber-library/). It is a template engine that separates PHP and HTML into their own file, reducing the amount of "spaghetti" code.
 
-So, download and include [its plugin](https://wordpress.org/plugins/timber-library/) into your WordPress installation.
-
-Custom Post Type
+CPT - Custom Post Type
 --------------------
 
 ![Wordpress Custom Type](http://cdn.setyono.net/edge/wp-post-type.jpg)
 
-    add_post_type( $name, <$icon>, <$taxonomy> )
+    add_post_type( $name, <$args_array> )
 
-Inside `functions.php`, add these codes:
+**Note**: The `$name` must be one-word, singular, and titleized case. Example:
 
-    add_post_type("Product", "cart", "Brand");
-    add_post_type("Event", "calendar");
+    add_post_type( "Product" );
+    add_post_type( "Event" );
 
-The icon name is taken from [melchoyce.github.io/dashicons/](http://melchoyce.github.io/dashicons/).
+Optional arguments list:
 
-**Note**:
+`icon` - Icon names are listed here [melchoyce.github.io/dashicons/](http://melchoyce.github.io/dashicons/). Exclude the "dashicons-".
+
+`taxonomy` - The custom category term. The naming convention is the same as CPT's name.
+
+`columns` - Array of columns shown in admin panel. Possible values are: `title`, `author`, `date`, `thumbnail`, and any custom field.
+
+Example:
 
-- If you want pagination to work, the `$name` cannot be the same as any page's slug.
+    add_post_type( "Product" , array(
+      "icon" => "cart",
+      "taxonomy" => "Brand",
+      "columns" => array("thumbnail", "title^", "price^", "date")
+    ) );
 
-- All type's name and taxonomy's name must be **singular** and no special character except space.
+Notice the `^` at the end of column's name? That indicates that the column is sortable.
 
 COMPASS
 =================

data/assets/sass/_edge.scss

@@ -1,7 +1,7 @@
 /* --------------------
 - EDGE Framework
 - edge.thesyne.com
-- v2.1.0 (Gondar)
+- v2.1.1 (Gondar)
 --------------------- */
 
 @import "edge/base";

data/assets/sass/edge/component/_button.scss

@@ -8,7 +8,8 @@
   button,
   .button,
   input[type="submit"],
-  input[type="reset"] {
+  input[type="reset"],
+  input[type="button"] {
     @content;
   }
 

data/assets/sass/edge/component/_code.scss

@@ -66,9 +66,13 @@ code {
   
   white-space: pre;
   word-spacing: normal;
+  
+  -moz-tab-size: 2;
+  tab-size: 2;
 
-  @include css3(tab-size, 2, $webkit:false, $moz:true, $ms:false, $o:true);
-  @include css3(hyphens, none, $webkit:true, $moz:true, $ms:true, $o:false);
+  -webkit-hyphens: none;
+  -moz-hyphens: none;
+  hyphens: none;
 }
 
 pre {

data/assets/sass/edge/component/_normalize.scss

@@ -167,6 +167,7 @@ textarea {
 table {
   border-collapse: collapse;
   border-spacing: 0;
+  width: 100%;
 }
 
 /* Miscellaneous useful HTML classes */

data/lib/edge/version.rb

@@ -1,4 +1,4 @@
 module Edge
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
   CODENAME = "Gondar"
 end

data/template/wordpress/code/cpt.php

@@ -1,82 +1,212 @@
 <?php
-/*
-  Create Custom Post Type
-*/
 
-function add_post_type($name, $icon = "admin-post", $tax_name = null) {
-  $plural = Inflector::pluralize($name);
-  $singular = $name;
-
-  $labels = array(
-    "name" => $plural,
-    "singular_name" => $singular,
-    "all_items" => "All " . $plural,
-    "add_new_item" => "Add New " . $singular,
-    "edit_item" => "Edit " . $singular,
-    "new_item" => "New " . $singular,
-    "view_item" => "View " . $singular,
-    "search_items" => "Search " . $plural,
-    "not_found" => "No " . strtolower($plural) . " found",
-    "not_found_in_trash" => "No " . strtolower($plural) . " found in Trash",
-    "parent_item_colon" => "Parent " . $singular . ":",
-  );
-
-  $post_args = array(
-    "public" => true,
-    "menu_icon" => "dashicons-".$icon,
-    "labels" => $labels,
-    "capability_type" => "post",
-    "supports" => array(
-      "title",
-      "editor",
-      "custom-fields",
-      "revisions",
-      "thumbnail",
-    ),
-  );
-  
-  // If taxonomy is given
-  if($tax_name) {
-    add_taxonomy($tax_name, $name);
+function add_post_type($name, $args) {
+  $cpt = new CPT($name, $args);
+  $cpt->init();
+}
+
+// CUSTOM Post Type
+class CPT {
+  private $name;
+  private $args;
+
+  public function __construct($name, $args) {
+    $this->name = $name;
+    $this->args = $args;
   }
 
-  register_post_type(strtolower($name), $post_args);
-}
+  // Add the post type and all of it's perk based on the args
+  public function init() {
+    $post_args = $this->buildArgs($this->name, $this->args);
 
-/*
-  Create Custom Taxonomy
-*/
+    // If taxonomy is given
+    if($this->args["taxonomy"]) {
+      $this->add_taxonomy($this->args["taxonomy"], $this->name);
+    }
+
+    register_post_type(strtolower($this->name), $post_args);
+
+    // if column ordering is given
+    if($this->args["columns"]) {
+      $this->add_column($this->name, $this->args["columns"]);
+    }
+  }
+
+  // Build the necessary arguments for CPT
+  private function buildArgs($name, $args) {
+    $plural = Inflector::pluralize($name);
+    $singular = $name;
+
+    $labels = array(
+      "name" => $plural,
+      "singular_name" => $singular,
+      "all_items" => "All " . $plural,
+      "add_new_item" => "Add New " . $singular,
+      "edit_item" => "Edit " . $singular,
+      "new_item" => "New " . $singular,
+      "view_item" => "View " . $singular,
+      "search_items" => "Search " . $plural,
+      "not_found" => "No " . strtolower($plural) . " found",
+      "not_found_in_trash" => "No " . strtolower($plural) . " found in Trash",
+      "parent_item_colon" => "Parent " . $singular . ":",
+    );
+
+    // Build the post arguments
+    $post_args = array(
+      "public" => true,
+      "labels" => $labels,
+      "capability_type" => "post",
+      "supports" => array(
+        "title",
+        "editor",
+        "custom-fields",
+        "revisions",
+        "thumbnail",
+      ),
+      "rewrite" => array(
+        "with_front" => false
+      ),
+    );
+
+    if($args["icon"]) {
+      $post_args["menu_icon"] = "dashicons-".$args["icon"];
+    }
+
+    return $post_args;
+  }
+
+  // Create taxonomy and it's filter
+  private function add_taxonomy($tax_name, $post_type) {
+    $plural = Inflector::pluralize($tax_name);
+    $singular = $tax_name;
+
+    $labels = array(
+      "name" => $plural,
+      "singular_name" => $singular,
+      "all_items" => "All " . $plural,
+      "edit_item" => "Edit " . $singular,
+      "view_item" => "View " . $singular,
+      "update_item" => "Update " . $singular,
+      "add_new_item" => "Add New " . $singular,
+      "parent_item" => "Parent " . $singular,
+      "search_items" => "Search " . $plural,
+      "popular_items" => "Popular " . $plural,
+      "add_or_remove_items" => "Add or remove " . strtolower($plural),
+      "choose_from_most_used" => "Choose from the most used " . strtolower($plural),
+      "not_found" => "No " . strtolower($plural) . " found"
+    );
 
-function add_taxonomy($name, $post_type) {
-  $plural = Inflector::pluralize($name);
-  $singular = $name;
-
-  $labels = array(
-    "name" => $plural,
-    "singular_name" => $singular,
-    "all_items" => "All " . $plural,
-    "edit_item" => "Edit " . $singular,
-    "view_item" => "View " . $singular,
-    "update_item" => "Update " . $singular,
-    "add_new_item" => "Add New " . $singular,
-    "parent_item" => "Parent " . $singular,
-    "search_items" => "Search " . $plural,
-    "popular_items" => "Popular " . $plural,
-    "add_or_remove_items" => "Add or remove " . strtolower($plural),
-    "choose_from_most_used" => "Choose from the most used " . strtolower($plural),
-    "not_found" => "No " . strtolower($plural) . " found"
-  );
-
-  $tax_args = array(
-    "labels" => $labels,
-    "show_ui" => true,
-    "query_var" => true,
-    "show_admin_column" => false,
-    "hierarchical" => true,
-  );
-  register_taxonomy(strtolower($name), strtolower($post_type), $tax_args);
-
-  new CPT_Filter(array(strtolower($post_type) => array(strtolower($singular) ) ) );
+    $tax_args = array(
+      "labels" => $labels,
+      "show_ui" => true,
+      "query_var" => true,
+      "show_admin_column" => false,
+      "hierarchical" => true,
+    );
+    register_taxonomy(strtolower($tax_name), strtolower($post_type), $tax_args);
+
+    new CPT_Filter(array(strtolower($post_type) => array(strtolower($singular) ) ) );
+  }
+
+  // Add visible column in admin panel
+  private function add_column($name, $raw_columns) {
+    // create the WP filter name
+    $name_slug = strtolower($name);
+    $name_create = "manage_".$name_slug."_posts_columns"; // create column
+    $name_fill = "manage_".$name_slug."_posts_custom_column"; // fill column
+    $name_sortable = "manage_edit-".$name_slug."_sortable_columns"; // enable sorting
+
+    // cleanup and build the dataset
+    $columns = $this->clean_columns($raw_columns);
+    $sortable_columns = $this->get_sortable_columns($raw_columns);
+
+    // create the filter function
+    $filter_create = function($defaults) use ($columns) {
+      $cols = array();
+      foreach($columns as $c) {
+        $cols[$c] = ucwords( str_replace("_", " ", $c) );
+      }
+      $cols = array("cb" => $defaults["cb"]) + $cols;
+      return $cols;
+    };
+
+    $filter_fill = function($column_name, $post_id) {
+      switch($column_name) {
+        case "cb":
+        case "title":
+        case "author":
+        case "date":
+          // do nothing, those are automatically filled
+          break;
+        case "thumbnail":
+          $thumb = get_the_post_thumbnail($post_id, array(75, 75) );
+          echo $thumb;
+
+        // if custom field
+        default:
+          global $post;
+          
+          $meta = get_post_meta($post_id, $column_name, true);
+          $terms = get_the_terms($post_id, $column_name);
+          
+          // if the column is a custom field
+          if($meta) {
+            echo $meta;
+          }
+          // if the column is a term
+          elseif (!empty($terms) ) {
+            $out = array();
+
+            // loop through each term, linking to the 'edit posts' page for the specific term
+            foreach ($terms as $term) {
+              $out[] = sprintf("<a href='%s'>%s</a>",
+                esc_url( add_query_arg(
+                  array("post_type" => $post->post_type, "type" => $term->slug), "edit.php")
+                ),
+                esc_html( sanitize_term_field(
+                  "name", $term->name, $term->term_id, "type", "display")
+                )
+              );
+            }
+
+            // join the terms, separating with comma
+            echo join(", ", $out);
+          }
+          break;
+      }
+    };
+
+    $filter_sortable = function($defaults) use ($sortable_columns) {
+      foreach($sortable_columns as $sc) {
+        $defaults[$sc] = $sc;
+      }
+      return $defaults;
+    };
+
+    add_filter($name_create, $filter_create);
+    add_action($name_fill, $filter_fill, 10, 2);
+    add_filter($name_sortable, $filter_sortable);
+  }
+
+  // Cleanup the column args from annotation
+  private function clean_columns($raw) {
+    $columns = array_map(function($c) {
+      return trim($c, "^");
+    }, $raw);
+
+    return $columns;
+  }
+
+  // Look for sortable column, annotated with ^
+  private function get_sortable_columns($raw) {
+    $columns = array_map(function($c) {
+      if(strpos($c, "^") ) {
+        return trim($c, "^");
+      }
+    }, $raw);
+
+    return array_filter($columns);
+  }
 }
 
 /*
@@ -137,4 +267,4 @@ class CPT_Filter {
       $this->generate_taxonomy_options($tax_slug, $term->term_id, $level + 1, $selected);
     }
   }
-}//end class
+}

data/template/wordpress/code/main.php

@@ -19,7 +19,7 @@ class TimberEdge extends TimberSite {
     $context["menu"] = new TimberMenu();
     $context["site"] = $this;
 
-    $context["home"] = home_url();
+    $context["home"] = home_url()."/";
     $context["root"] = get_template_directory_uri();
     $context["img"] = $context["root"]."/assets/img";
     $context["css"] = $context["root"]."/assets/css";
@@ -37,25 +37,27 @@ class TimberEdge extends TimberSite {
 new TimberEdge();
 
 /* REMOVE MENU ITEMS */
-function h_remove_menu() {
+add_action("admin_menu", function() {
   $items = get_removed_list();
   global $menu;
   end($menu);
-  while(prev($menu) ) {
-    $item = explode(" ", $menu[key($menu)][0]);
-    $item_first = $item[0] != NULL ? $item[0] : "";
-    if(in_array($item_first, $items) ) {
-      unset($menu[key($menu)]);
+
+  // var_dump($menu);
+  foreach($menu as $key => $m) {
+    if($m[0]) {
+      $i = explode(" <", $m[0]);
+
+      if(in_array($i[0], $items) ) {
+        unset($menu[$key]);
+      }
     }
   }
-}
-add_action("admin_menu", "h_remove_menu");
+});
 
 /* REMOVE IMAGE RESIZER */
-function h_remove_resizer($sizes) {
+add_filter("intermediate_image_sizes_advanced", function($sizes) {
   unset( $sizes["medium"]);
   unset( $sizes["large"]);
 
   return $sizes;
-}
-add_filter("intermediate_image_sizes_advanced", "h_remove_resizer");
+});

data/template/wordpress/functions.php

@@ -9,8 +9,8 @@ add_theme_support("post-thumbnails");
 add_theme_support("menus");
 
 // CUSTOM POST TYPE
-// FORMAT  : type-name, <icon>, <taxonomy-name>
-// EXAMPLE : add_post_type("Product", "cart", "Brand");
+// FORMAT  : add_post_type(name, <args>)
+// check edge.thesyne.com/wordpress for detail
 
 // THUMBNAIL SIZE
 // FORMAT  : add_image_size("thumbnail", <width>, <height>, <crop or not>);

data/template/wordpress/views/layout.twig

@@ -1,7 +1,30 @@
 <!DOCTYPE html>
 <html {{ site.language_attributes }}>
 
-{% include "partials/_head.twig" %}
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+
+  <!-- WEBSITE DETAIL -->
+  <title>
+    {{ site.name }}
+    {% if wp_title %} | {{ wp_title }} {% endif %}
+  </title>
+  <meta name="description" content="{{ site.description }}">
+
+  <!-- FAVICON -->
+  <link rel="icon" href="{{ img }}/favicon.png">
+  <link rel="apple-touch-icon-precomposed" href="{{ img }}/favicon-big.png">
+  
+  <!-- JAVASCRIPT that must load first -->
+  <script src="{{ js }}/vendor/custom.modernizr.js"></script>
+  
+  <!-- STYLESHEET -->
+  <link rel="stylesheet" href="{{ css }}/framework.css">
+  <link rel="stylesheet" href="{{ css }}/app.css">
+
+  {{ wp_head }}
+</head>
 
 <body class="{{ body_class }}">
 
@@ -10,7 +33,7 @@
     <!-- Main Navigation Menu -->
     <nav class="main-menu">
       {% for item in menu.get_items %}
-        <div class="item">
+        <div class="item {% if item.get_children %} has-child {% endif %}">
           
           <a href="{{ item.get_link }}"
             {% if "current-menu-item" in item.classes %}
@@ -21,7 +44,7 @@
           </a>
           
           {% if item.get_children %}
-            <div class="dropdown">
+            <div class="child-menu">
               {% for child in item.get_children %}
                 <a href="{{ child.get_link }}">{{ child.title }}</a>
               {% endfor %}
@@ -48,7 +71,19 @@
     {{ site.name }} &copy; {{ "now" | date("Y") }}
   </footer>
 
-  {% include "partials/_foot.twig" %}
+  <!-- JAVASCRIPT LIBRARY -->
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+  <script>
+    // Fallback if Google's one doesn't load
+    if (!window.jQuery) {
+      document.write("<script src='{{ js }}/vendor/jquery.min.js'><\/script>");
+    }
+  </script>
+  <script src="{{ js }}/vendor/fastclick.min.js"></script>
+  <script src="{{ js }}/vendor/edge.js"></script>
+  <script src="{{ js }}/app.js"></script>
+
+  {{ wp_footer }}
   
 </body>
 </html>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edge_framework
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Henner Setyono
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -216,8 +216,6 @@ files:
 - template/wordpress/views/index.twig
 - template/wordpress/views/layout.twig
 - template/wordpress/views/page.twig
-- template/wordpress/views/partials/_foot.twig
-- template/wordpress/views/partials/_head.twig
 - template/wordpress/views/partials/_pagination.twig
 - template/wordpress/views/partials/_posts.twig
 - template/wordpress/views/search.twig

data/template/wordpress/views/partials/_foot.twig

@@ -1,13 +0,0 @@
-<!-- JAVASCRIPT LIBRARY -->
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-<script>
-  // Fallback if Google's one doesn't load
-  if (!window.jQuery) {
-    document.write("<script src='{{ js }}/vendor/jquery.min.js'><\/script>");
-  }
-</script>
-<script src="{{ js }}/vendor/fastclick.min.js"></script>
-<script src="{{ js }}/vendor/edge.js"></script>
-<script src="{{ js }}/app.js"></script>
-
-{{ wp_footer }}

data/template/wordpress/views/partials/_head.twig

@@ -1,24 +0,0 @@
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-
-  <!-- WEBSITE DETAIL -->
-  <title>
-    {{ site.name }}
-    {% if wp_title %} | {{ wp_title }} {% endif %}
-  </title>
-  <meta name="description" content="{{ site.description }}">
-
-  <!-- FAVICON -->
-  <link rel="icon" href="{{ img }}/favicon.png">
-  <link rel="apple-touch-icon-precomposed" href="{{ img }}/favicon-big.png">
-  
-  <!-- JAVASCRIPT that must load first -->
-  <script src="{{ js }}/vendor/custom.modernizr.js"></script>
-  
-  <!-- STYLESHEET -->
-  <link rel="stylesheet" href="{{ css }}/framework.css">
-  <link rel="stylesheet" href="{{ css }}/app.css">
-
-  {{ wp_head }}
-</head>