styling and stuff

Author: splitbrain

Profile.php

@@ -100,7 +100,6 @@ public function getSyncList() {
         }
 
         $this->consolidateSyncList();
-        ksort($this->synclist); #FIXME implement our own sort with dir=0 at the top
         return $this->synclist;
     }
 
@@ -305,10 +304,9 @@ protected function consolidateSyncList() {
 
         foreach([self::TYPE_PAGES, self::TYPE_MEDIA] as $type) {
             foreach($this->synclist[$type] as $id => $item) {
-
                 // no sync if hashes match
                 if($item['remote']['hash'] == $item['local']['hash']) {
-                    unset($this->synclist[$type][$item['id']]);
+                    unset($this->synclist[$type][$id]);
                     continue;
                 }
 
@@ -333,7 +331,7 @@ protected function consolidateSyncList() {
                         $dir = self::DIR_PUSH;
                     }
                 }
-                $this->synclist[$type][$item['id']]['dir'] = $dir;
+                $this->synclist[$type][$id]['dir'] = $dir;
             }
         }
     }

action.php

@@ -66,15 +66,45 @@ protected function sync_init() {
         $profile = $prmanager->getProfile($profno);
         $list = $profile->getSyncList();
         $times = $profile->getTimes();
+        $count = 0;
+
+        foreach($list as $items) {
+            $count += count($items);
+        }
 
         $data = [
             'times' => [
                 'ltime' => $times[0],
                 'rtime' => $times[1],
             ],
             'list' => $list,
+            'count' => $count
         ];
 
         return $data;
     }
+
+    /**
+     * Store the times of the last sync
+     *
+     * @return bool
+     */
+    protected function sync_finish() {
+        global $INPUT;
+        $prmanager = new ProfileManager();
+        $profno = $INPUT->int('no');
+
+        $profile = $prmanager->getProfile($profno);
+        $times = $profile->getTimes();
+
+        $config = $profile->getConfig();
+
+        $config['ltime'] = $INPUT->int('ltime');
+        $config['rtime'] = $INPUT->int('rtime');
+        $config['letime'] = $times[0];
+        $config['retime'] = $times[1];
+
+        $prmanager->setProfileConfig($profno, $config);
+        return true;
+    }
 }

admin.php

@@ -131,12 +131,13 @@ function html() {
 
             echo '<script src="' . DOKU_BASE . 'lib/plugins/sync/sync.js" type="text/javascript"></script>';
 
-            echo '<div id="sync__progress"></div>';
+            echo '<div id="sync__progress"><div class="label"></div></div>';
             echo '<div id="sync__plugin"></div>';
 
         } else {
             echo $this->locale_xhtml('intro');
 
+            echo '<div id="sync__plugin__form">';
             echo '<div class="sync_left">';
             $this->profileDropdown();
             if($this->profno !== -1) {
@@ -147,6 +148,7 @@ function html() {
             echo '<div class="sync_right">';
             $this->profileForm();
             echo '</div>';
+            echo '</div>';
         }
     }
 

lang/en/lang.php

@@ -53,11 +53,13 @@
 $lang['remote'] = 'Remote Wiki';
 $lang['diff']   = 'Diff';
 
-$lang['push']    = 'Push local revision to remote wiki.';
-$lang['pushdel'] = 'Delete revision at the remote wiki.';
-$lang['pull']    = 'Pull remote revision to local wiki.';
-$lang['pulldel'] = 'Delete local revision.';
-$lang['keep']    = 'Skip this file and keep both revisions as is.';
+$lang['js']['push']    = 'Push local revision to remote wiki.';
+$lang['js']['pushdel'] = 'Delete revision at the remote wiki.';
+$lang['js']['pull']    = 'Pull remote revision to local wiki.';
+$lang['js']['pulldel'] = 'Delete local revision.';
+$lang['js']['keep']    = 'Skip this file and keep both revisions as is.';
 
 $lang['syncdone'] = 'Synchronization finished.';
 $lang['timeout'] = 'Timeout';
+
+