Folders are reorganized

Some interface improvements are made

simple-ads-manager/ad.class.php → ad.class.php

@@ -202,7 +202,7 @@ private function buildAd( $args = null, $useCodes = false ) {
       else $cycle = $settings['adCycle'];
       $el = (integer)$settings['errorlogFS'];
 
-      global $wpdb/*, $current_user*/;
+      global $wpdb;
       $pTable = $wpdb->prefix . "sam_places";          
       $aTable = $wpdb->prefix . "sam_ads";
       $eTable = $wpdb->prefix . "sam_errors";

simple-ads-manager/admin.class.php → admin.class.php

@@ -282,7 +282,7 @@ public function adminEditStyles() {
       wp_enqueue_style('slick', SAM_URL.'css/slick.grid.css', false, '2.0');
       wp_enqueue_style('ComboGrid', SAM_URL.'css/jquery.ui.combogrid.css', false, '1.6.2');
       wp_enqueue_style('wp-pointer');
-      wp_enqueue_style('colorButtons', SAM_URL.'css/color-buttons.min.css', false, SAM_VERSION);
+      wp_enqueue_style('colorButtons', SAM_URL.'css/color-buttons.css', false, SAM_VERSION);
     }
 
     public function adminSettingsStyles() {

simple-ads-manager/block.editor.admin.class.php → block.editor.admin.class.php

@@ -258,7 +258,10 @@ public function page() {
                   <div id="minor-publishing-actions">
                     <div id="save-action"> </div>
                     <div id="preview-action">
-                      <a id="post-preview" class="preview button" href='<?php echo admin_url('admin.php'); ?>?page=sam-block-list'><?php _e('Back to Blocks List', SAM_DOMAIN) ?></a>
+                      <a id="back-button" class="color-btn color-btn-left" href='<?php echo admin_url('admin.php'); ?>?page=sam-block-list'>
+                        <b style="background-color: #bcbcbc"></b>
+                        <?php _e('Back to Blocks List', SAM_DOMAIN) ?>
+                      </a>
                     </div>
                     <div class="clear"></div>
                   </div>
@@ -278,10 +281,18 @@ public function page() {
                 </div>
                 <div id="major-publishing-actions">
                   <div id="delete-action">
-                    <a class="submitdelete deletion" href='<?php echo admin_url('admin.php'); ?>?page=sam-block-list'><?php _e('Cancel', SAM_DOMAIN) ?></a>
+                    <!--<a class="submitdelete deletion" href='<?php echo admin_url('admin.php'); ?>?page=sam-block-list'><?php _e('Cancel', SAM_DOMAIN) ?></a>-->
                   </div>
                   <div id="publishing-action">
-                    <input type="submit" class='button-primary' name="update_block" value="<?php _e('Save', SAM_DOMAIN) ?>" />
+                    <a id="cancel-button" class="color-btn color-btn-left" href='<?php echo admin_url('admin.php'); ?>?page=sam-block-list'>
+                      <b style="background-color: #E5584A"></b>
+                      <?php _e('Cancel', SAM_DOMAIN) ?>
+                    </a>
+                    <button id="submit-button" class="color-btn color-btn-left" name="update_block" type="submit">
+                      <b style="background-color: #21759b"></b>
+                      <?php _e('Save', SAM_DOMAIN) ?>
+                    </button>
+                    <!--<input type="submit" class='button-primary' name="update_block" value="<?php _e('Save', SAM_DOMAIN) ?>" />-->
                   </div>
                   <div class="clear"></div>
                 </div>

css/color-buttons.css

@@ -0,0 +1,220 @@
+.color-btn {
+    display:inline-block;
+    position:relative;
+    min-width:12px;
+    color:#333;
+    font-size:13px;
+    font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;
+    padding:5px 8px 5px 8px;
+    text-align:left;
+    text-shadow:0 1px 0 rgba(255,255,255,0.7);
+    margin:2px;
+    /*height:15px;*/
+    line-height:15px;
+    white-space:nowrap;
+    cursor:pointer;
+    border:1px solid #ccc;
+    border-radius:2px;
+    background:#f5f5f5;
+    background:linear-gradient(to top,#f5f5f5,#ddd);
+    background:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#ddd));
+    background:-moz-linear-gradient(top,#f5f5f5,#ddd);
+    background:-ms-linear-gradient(top,#f5f5f5,#ddd);
+    background:-o-linear-gradient(top,#f5f5f5,#ddd);
+    filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5',endColorstr='#dddddd');
+    -moz-box-shadow:-1px 2px 3px rgba(0,0,0,0.1);
+    -webkit-box-shadow:-1px 2px 3px rgba(0,0,0,0.1);
+    box-shadow:-1px 2px 3px rgba(0,0,0,0.1)
+}
+
+.color-btn:hover,.color-btn:active {
+    background:#fdfdfd;
+    background:linear-gradient(top,#fdfdfd,#eee);
+    background:-webkit-gradient(linear,left top,left bottom,from(#fdfdfd),to(#eee));
+    background:-moz-linear-gradient(top,#fdfdfd,#eee);
+    background:-ms-linear-gradient(top,#fdfdfd,#eee);
+    background:-o-linear-gradient(top,#fdfdfd,#eee);
+    filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fdfdfd',endColorstr='#eeeeee');
+    border:1px solid #ddd
+}
+
+.color-btn:active {
+    -moz-box-shadow:-1px 2px 3px rgba(0,0,0,0.1),-1px 3px 7px rgba(0,0,0,0.1) inset;
+    -webkit-box-shadow:-1px 2px 3px rgba(0,0,0,0.1),-1px 3px 7px rgba(0,0,0,0.1) inset;
+    box-shadow:-1px 2px 3px rgba(0,0,0,0.1),-1px 3px 7px rgba(0,0,0,0.1) inset
+}
+
+.color-btn b {
+    -moz-box-shadow:-1px 2px 3px rgba(0,0,0,0.1),0px -1px 0 rgba(255,255,255,0.15) inset;
+    -webkit-box-shadow:-1px 2px 3px rgba(0,0,0,0.1),0px -1px 0 rgba(255,255,255,0.15) inset;
+    box-shadow:-1px 2px 3px rgba(0,0,0,0.1),0px -1px 0 rgba(255,255,255,0.15) inset
+}
+
+.color-btn-square b {
+    border-radius:1px;width:15px;
+    height:15px;display:inline-block;
+    vertical-align:top;margin:-1px 3px 0 0
+}
+
+.color-btn-square.color-btn-fixed {
+    width:72px
+}
+
+.color-btn-vertical b {
+    border-radius:1px;
+    width:3px;
+    height:17px;
+    display:inline-block;
+    vertical-align:top;
+    margin:-1px 3px 0 0
+}
+
+.color-btn-vertical.color-btn-fixed {
+    width:60px
+}
+
+.color-btn-circle b {
+    border-radius:5px;
+    width:5px;
+    height:5px;
+    display:inline-block;
+    vertical-align:top;
+    margin:5px 3px 0 0
+}
+
+.color-btn-circle.color-btn-fixed {
+    width:62px
+}
+
+.color-btn-horizontal {
+    text-align:center
+}
+
+.color-btn-horizontal b {
+    border-radius:1px;
+    position:relative;
+    top:15px;
+    left:0;
+    height:3px;
+    display:block;
+    margin-bottom:-3px;
+    overflow:hidden
+}
+
+.color-btn-horizontal.color-btn-fixed {
+    width:56px
+}
+
+.color-btn-left{
+    padding-left:14px
+}
+
+.color-btn-left b {
+    position:absolute;
+    left:-1px;
+    top:-1px;
+    width:9px;
+    height:25px;
+    display:inline-block;
+    vertical-align:top;
+    border-bottom-left-radius:2px;
+    border-top-left-radius:2px;
+    border-left:1px solid transparent;
+    border-top:1px solid transparent;
+    border-bottom:1px solid transparent;
+    border-right:0;
+    background:rgba(0,0,0,0);
+    background:linear-gradient(top,rgba(0,0,0,0),rgba(0,0,0,0.1));
+    background:-webkit-gradient(linear,left top,left bottom,from(rgba(0,0,0,0)),to(rgba(0,0,0,0.1)));
+    background:-moz-linear-gradient(top,rgba(0,0,0,0),rgba(0,0,0,0.1));
+    background:-ms-linear-gradient(top,rgba(0,0,0,0),rgba(0,0,0,0.1));
+    background:-o-linear-gradient(top,rgba(0,0,0,0),rgba(0,0,0,0.1));
+    -moz-box-shadow:none;
+    -webkit-box-shadow:none;
+    box-shadow:none
+}
+
+.color-btn-left:hover b,.color-btn-left:active b {
+    background:rgba(0,0,0,0);
+    background:linear-gradient(top,rgba(0,0,0,0),rgba(0,0,0,0.05));
+    background:-webkit-gradient(linear,left top,left bottom,from(rgba(0,0,0,0)),to(rgba(0,0,0,0.05)));
+    background:-moz-linear-gradient(top,rgba(0,0,0,0),rgba(0,0,0,0.05));
+    background:-ms-linear-gradient(top,rgba(0,0,0,0),rgba(0,0,0,0.05));
+    background:-o-linear-gradient(top,rgba(0,0,0,0),rgba(0,0,0,0.05))
+}
+
+.color-btn-left:active b {
+    -moz-box-shadow:0 8px 7px -5px rgba(0,0,0,0.1) inset;
+    -webkit-box-shadow:0 8px 7px -5px rgba(0,0,0,0.1) inset;
+    box-shadow:0 8px 7px -5px rgba(0,0,0,0.1) inset
+}
+
+.color-btn-left.color-btn-fixed {
+    width:54px
+}
+
+.color-btn-right {
+    padding-right:14px
+}
+
+.color-btn-right b {
+    position:absolute;
+    right:-1px;
+    top:-1px;
+    width:9px;
+    height:25px;
+    display:inline-block;
+    vertical-align:top;
+    border-bottom-right-radius:2px;
+    border-top-right-radius:2px;
+    border-right:1px solid transparent;
+    border-top:1px solid transparent;
+    border-bottom:1px solid transparent;
+    border-right:0;
+    background:rgba(0,0,0,0);
+    background:linear-gradient(top,rgba(0,0,0,0),rgba(0,0,0,0.1));
+    background:-webkit-gradient(linear,left top,left bottom,from(rgba(0,0,0,0)),to(rgba(0,0,0,0.1)));
+    background:-moz-linear-gradient(top,rgba(0,0,0,0),rgba(0,0,0,0.1));
+    background:-ms-linear-gradient(top,rgba(0,0,0,0),rgba(0,0,0,0.1));
+    background:-o-linear-gradient(top,rgba(0,0,0,0),rgba(0,0,0,0.1));
+    -moz-box-shadow:none;
+    -webkit-box-shadow:none;
+    box-shadow:none
+}
+
+.color-btn-right:hover b, .color-btn-right:active b {
+    background:rgba(0,0,0,0);
+    background:linear-gradient(to top,rgba(0,0,0,0),rgba(0,0,0,0.05));
+    background:-webkit-gradient(linear,left top,left bottom,from(rgba(0,0,0,0)),to(rgba(0,0,0,0.05)));
+    background:-moz-linear-gradient(top,rgba(0,0,0,0),rgba(0,0,0,0.05));
+    background:-ms-linear-gradient(top,rgba(0,0,0,0),rgba(0,0,0,0.05));
+    background:-o-linear-gradient(top,rgba(0,0,0,0),rgba(0,0,0,0.05))
+}
+
+.color-btn-right:active b {
+    -moz-box-shadow:0 8px 7px -5px rgba(0,0,0,0.1) inset;
+    -webkit-box-shadow:0 8px 7px -5px rgba(0,0,0,0.1) inset;
+    box-shadow:0 8px 7px -5px rgba(0,0,0,0.1) inset
+}
+
+.color-btn-right.color-btn-fixed {
+    width:54px
+}
+
+button.color-btn {
+    appearance: normal;
+    -webkit-appearance: none;
+    -moz-appearance: none;
+}
+
+a.color-btn {
+    appearance: normal;
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    text-decoration: none;
+}
+
+a:hover.color-btn {
+    text-decoration: none;
+    color: inherit;
+}

simple-ads-manager/editor.admin.class.php → editor.admin.class.php

@@ -340,7 +340,10 @@ public function page() {
                   <div id="minor-publishing-actions">
                     <div id="save-action"> </div>
                     <div id="preview-action">
-                      <a id="post-preview" class="preview button" href='<?php echo admin_url('admin.php'); ?>?page=sam-list'><?php _e('Back to Places List', SAM_DOMAIN) ?></a>
+                      <a id="back-button" class="color-btn color-btn-left" href='<?php echo admin_url('admin.php'); ?>?page=sam-list'>
+                        <b style="background-color: #bcbcbc"></b>
+                        <?php _e('Back to Places List', SAM_DOMAIN) ?>
+                      </a>
                     </div>
                     <div class="clear"></div>
                   </div>
@@ -368,10 +371,18 @@ public function page() {
                 </div>
                 <div id="major-publishing-actions">
                   <div id="delete-action">
-                    <a class="submitdelete deletion" href='<?php echo admin_url('admin.php'); ?>?page=sam-list'><?php _e('Cancel', SAM_DOMAIN) ?></a>
+                    <!--<a class="submitdelete deletion" href='<?php echo admin_url('admin.php'); ?>?page=sam-list'><?php _e('Cancel', SAM_DOMAIN) ?></a>-->
                   </div>
                   <div id="publishing-action">
-                    <input type="submit" class='button-primary' name="update_place" value="<?php _e('Save', SAM_DOMAIN) ?>" />
+                    <a id="cancel-button" class="color-btn color-btn-left" href='<?php echo admin_url('admin.php'); ?>?page=sam-list'>
+                      <b style="background-color: #E5584A"></b>
+                      <?php _e('Cancel', SAM_DOMAIN) ?>
+                    </a>
+                    <button id="submit-button" class="color-btn color-btn-left" name="update_place" type="submit">
+                      <b style="background-color: #21759b"></b>
+                      <?php _e('Save', SAM_DOMAIN) ?>
+                    </button>
+                    <!--<input type="submit" class='button-primary' name="update_place" value="<?php _e('Save', SAM_DOMAIN) ?>" />-->
                   </div>
                   <div class="clear"></div>
                 </div>
@@ -815,7 +826,10 @@ public function page() {
                   <div id="minor-publishing-actions">
                     <div id="save-action"> </div>
                     <div id="preview-action">
-                      <a id="post-preview" class="preview button" href='<?php echo admin_url('admin.php'); ?>?page=sam-list&action=items&mode=active&item=<?php echo $row['pid'] ?>'><?php _e('Back to Ads List', SAM_DOMAIN) ?></a>
+                      <a id="back-button" class="color-btn color-btn-left" href='<?php echo admin_url('admin.php'); ?>?page=sam-list&action=items&mode=active&item=<?php echo $row['pid'] ?>'>
+                        <b style="background-color: #bcbcbc"></b>
+                        <?php _e('Back to Ads List', SAM_DOMAIN) ?>
+                      </a>
                     </div>
                     <div class="clear"></div>
                   </div>
@@ -854,10 +868,18 @@ public function page() {
                 </div>
                 <div id="major-publishing-actions">
                   <div id="delete-action">
-                    <a class="submitdelete deletion" href='<?php echo admin_url('admin.php'); ?>?page=sam-list&action=items&mode=active&item=<?php echo $row['pid'] ?>'><?php _e('Cancel', SAM_DOMAIN) ?></a>
+                    <!--<a class="submitdelete deletion" href='<?php echo admin_url('admin.php'); ?>?page=sam-list&action=items&mode=active&item=<?php echo $row['pid'] ?>'><?php _e('Cancel', SAM_DOMAIN) ?></a>-->
                   </div>
                   <div id="publishing-action">
-                    <input type="submit" class='button-primary' name="update_item" value="<?php _e('Save', SAM_DOMAIN) ?>" />
+                    <a id="cancel-button" class="color-btn color-btn-left" href='<?php echo admin_url('admin.php'); ?>?page=sam-list&action=items&mode=active&item=<?php echo $row['pid'] ?>'>
+                      <b style="background-color: #E5584A"></b>
+                      <?php _e('Cancel', SAM_DOMAIN) ?>
+                    </a>
+                    <button id="submit-button" class="color-btn color-btn-left" name="update_item" type="submit">
+                      <b style="background-color: #21759b"></b>
+                      <?php _e('Save', SAM_DOMAIN) ?>
+                    </button>
+                    <!--<input type="submit" class='button-primary' name="update_item" value="<?php _e('Save', SAM_DOMAIN) ?>" />-->
                   </div>
                   <div class="clear"></div>
                 </div>

simple-ads-manager/js/langs/ru.js → js/langs/ru.js

@@ -1,9 +1,9 @@
-tinyMCE.addI18n("ru.samb", {
-	insert_samb : 'Вставить рекламное объявление',
-  title: 'Вставить рекламное объявление',
-  description: 'Выбрать объект рекламы',
-  ad: 'Вставить объявление',
-  place: 'Вставить рекламное место',
-  zone: 'Вставить рекламную зону',
-  block: 'Вставить блок рекламы'
+tinyMCE.addI18n("ru.samb", {
+	insert_samb : 'Вставить рекламное объявление',
+  title: 'Вставить рекламное объявление',
+  description: 'Выбрать объект рекламы',
+  ad: 'Вставить объявление',
+  place: 'Вставить рекламное место',
+  zone: 'Вставить рекламную зону',
+  block: 'Вставить блок рекламы'
 });

simple-ads-manager/js/sam-admin-edit-zb.js → js/sam-admin-edit-zb.js

@@ -6,7 +6,7 @@
   $(document).ready(function() {
     var sPointer;
 
-    $(document).tooltip({
+    $('#title').tooltip({
       track: true
     });
 

simple-ads-manager/js/sam-admin-edit.js → js/sam-admin-edit.js

@@ -6,7 +6,7 @@
 
 
   $(document).ready(function () {
-    $(document).tooltip({
+    $("#title").tooltip({
       track: true
     });