Merge pull request #117 from OpenDevelopmentMekong/master

Merge to prod for releasing v2.1.4
OpenDevelopmentMekong · Dec 23, 2016 · 2c1f1ec · 2c1f1ec
2 parents f83d7e1 + e5d58d3
commit 2c1f1ec
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 7 deletions.
diff --git a/css/profile-pages.css b/css/profile-pages.css
@@ -232,7 +232,7 @@ table.dataTable thead .sorting_desc_disabled {
   display: inline-block;
   margin-bottom: 0;
   max-height: 100px;
-  height: 80px; 
+  height: 80px;
   overflow: hidden;
   margin: 0;
   padding: 0;
@@ -531,6 +531,7 @@ div.table-wrapper table.spreadsheet{
 table.spreadsheet {
   width: 100%;
   border-bottom: 0;
+  hyphens: none;
 }
 table.spreadsheet tbody tr:nth-child(2n+1){
   background-color: #fff;
@@ -551,6 +552,23 @@ table.spreadsheet td{
   border-bottom: 1px solid #efefef;
   line-height: 24px;
 }
-table.spreadsheet td:last-child{
-  border-left: 0;
+
+table.no-bgcolor {
+  hyphens: none;
+}
+table.no-bgcolor tr td {
+  hyphens: none;
+  background-color: #fff;
+  padding: 5px 10px;
+}
+
+table.no-bgcolor tr th {
+  border-left: 1px solid #ddd;
+}
+table.no-bgcolor tr td{
+  border-left: 1px solid #ccc;
+  border-bottom: 1px solid #ccc;
+}
+table.no-bgcolor tr{
+  border-right: 1px solid #ccc;
 }
diff --git a/post-types/profile-pages.php b/post-types/profile-pages.php
@@ -82,7 +82,7 @@ public function add_meta_box()
            __('Template layout', 'wp-odm_profile_pages'),
            array($this, 'template_layout_settings_box'),
            'profiles',
-           'advanced',
+           'simple',
            'high'
           );
           add_meta_box(
@@ -122,7 +122,7 @@ public function template_layout_settings_box($post = false)
            <select id="_attributes_template_layout" name="_attributes_template_layout">
               <option value="default" <?php if ($template == "default"): echo "selected"; endif; ?>>Default</option>
               <option value="with-widget" <?php if ($template == "with-widget"): echo "selected"; endif; ?>>With widgets</option>
-              <option value="sub-profile-page" <?php if ($template == "sub-profile-page"): echo "selected"; endif; ?>>Sub profile page</option>
+              <option value="with-right-sibebar" <?php if ($template == "with-right-sibebar"): echo "selected"; endif; ?>>With right sidebar</option>
             </select>
           </div>
       <?php

diff --git a/post-types/templates/single-profiles.php b/post-types/templates/single-profiles.php
@@ -68,7 +68,7 @@
         else:
           if ($template == 'with-widget'):
             include 'page-profiles-page-with-widget.php';
-          elseif ($template == 'sub-profile-page'):
+          elseif ($template == 'with-right-sibebar'):
             include 'page-profiles-with-right-sidebar.php';
           else:
             include 'page-profiles-list-page.php';
@@ -92,4 +92,4 @@
 
 });
 
-</script>
+</script>