[haiku-depot-web] [haiku-depot-web-app] 4 new revisions pushed by haiku.li...@xxxxxxxxx on 2014-02-26 18:33 GMT

  • From: haiku-depot-web-app@xxxxxxxxxxxxxx
  • To: haiku-depot-web@xxxxxxxxxxxxx
  • Date: Wed, 26 Feb 2014 18:34:12 +0000

master moved from b7bcc076c74e to cef96db7d23a

4 new revisions:

Revision: fe2be392ee70
Author:   Andrew Lindesay <apl@xxxxxxxxxxxxxx>
Date:     Tue Feb 25 11:04:25 2014 UTC
Log: + more view and download options when viewing a screenshot on a pkg 
http://code.google.com/p/haiku-depot-web-app/source/detail?r=fe2be392ee70

Revision: 0423e8940a79
Author:   Andrew Lindesay <apl@xxxxxxxxxxxxxx>
Date:     Tue Feb 25 11:12:41 2014 UTC
Log:      + screenshot alignment / viewing tweaks
http://code.google.com/p/haiku-depot-web-app/source/detail?r=0423e8940a79

Revision: 944002805b1f
Author:   Andrew Lindesay <apl@xxxxxxxxxxxxxx>
Date:     Wed Feb 26 09:35:17 2014 UTC
Log:      + screenshot editing; ability to order the screenshots
http://code.google.com/p/haiku-depot-web-app/source/detail?r=944002805b1f

Revision: cef96db7d23a
Author:   Andrew Lindesay <apl@xxxxxxxxxxxxxx>
Date:     Wed Feb 26 09:41:41 2014 UTC
Log:      + screenshot editing; small tweak
http://code.google.com/p/haiku-depot-web-app/source/detail?r=cef96db7d23a

==============================================================================
Revision: fe2be392ee70
Author:   Andrew Lindesay <apl@xxxxxxxxxxxxxx>
Date:     Tue Feb 25 11:04:25 2014 UTC
Log: + more view and download options when viewing a screenshot on a pkg 

http://code.google.com/p/haiku-depot-web-app/source/detail?r=fe2be392ee70

Added:
 /haikudepotserver-webapp/src/main/webapp/img/download.svg
 /haikudepotserver-webapp/src/main/webapp/img/newwindow.svg
Modified:
 /haikudepotserver-webapp/src/main/webapp/js/app/controller/viewpkg.html
/haikudepotserver-webapp/src/main/webapp/js/app/controller/viewpkgcontroller.js 

=======================================
--- /dev/null
+++ /haikudepotserver-webapp/src/main/webapp/img/download.svg Tue Feb 25 11:04:25 2014 UTC 
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg";
+   version="1.1"
+   width="12"
+   height="12">
+<path fill="none" stroke="black" stroke-width="1" d="M4.5 0.5 L7.5 0.5 L7.5 4.5 L11.5 4.5 L6 11.5 L0.5 4.5 L4.4 4.5 Z"/> 
+</svg>
=======================================
--- /dev/null
+++ /haikudepotserver-webapp/src/main/webapp/img/newwindow.svg Tue Feb 25 11:04:25 2014 UTC 
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg";
+   version="1.1"
+   width="12"
+   height="12">
+<path stroke-width="1" stroke="black" fill="none" d="M2.5 6.5 L0.5 6.5 L0.5 11.5 L5.5 11.5 L5.5 9.5"/> +<path stroke-width="1" stroke="black" fill="none" d="M2.5 9.5 L2.5 0.5 L11.5 0.5 L11.5 9.5 Z"/> 
+</svg>
=======================================
--- /haikudepotserver-webapp/src/main/webapp/js/app/controller/viewpkg.html Mon Feb 24 10:10:13 2014 UTC +++ /haikudepotserver-webapp/src/main/webapp/js/app/controller/viewpkg.html Tue Feb 25 11:04:25 2014 UTC 
@@ -26,14 +26,25 @@
         <div id="pkg-screenshot-container">

             <div id="pkg-screenshot-pagination-container">
+
+ <a href="{{currentPkgScreenshot().imageDownloadUrl}}" target="_blank" ng-show="pkgScreenshots.length"> 
+                    <img src="/img/download.svg">
+                </a>
+
+ <a href="{{currentPkgScreenshot().imageLargeUrl}}" target="_blank" ng-show="pkgScreenshots.length"> 
+                    <img src="/img/newwindow.svg">
+                </a>
+
                 <pagination-arrow
                         page-click="goPreviousScreenshot()"
active="pkgScreenshots.length && pkgScreenshotOffset > 0" 
                         direction="left"></pagination-arrow>
+
                 <pagination-arrow
                         page-click="goNextScreenshot()"
active="pkgScreenshots.length && pkgScreenshotOffset < (pkgScreenshots.length-1)" 
                         direction="right"></pagination-arrow>
+
             </div>

             <div id="pkg-screenshot-title">
=======================================
--- /haikudepotserver-webapp/src/main/webapp/js/app/controller/viewpkgcontroller.js Mon Feb 24 10:10:13 2014 UTC +++ /haikudepotserver-webapp/src/main/webapp/js/app/controller/viewpkgcontroller.js Tue Feb 25 11:04:25 2014 UTC 
@@ -16,6 +16,7 @@

             var SCREENSHOT_THUMBNAIL_TARGETWIDTH = 480;
             var SCREENSHOT_THUMBNAIL_TARGETHEIGHT = 320;
+            var SCREENSHOT_MAX_TARGETHEIGHT = 1500;

             $scope.breadcrumbItems = undefined;
             $scope.pkg = undefined;
@@ -159,7 +160,12 @@
                                     SCREENSHOT_THUMBNAIL_TARGETHEIGHT),
                                 imageDownloadUrl : pkgScreenshot.rawUrl(
                                     $scope.pkg,
-                                    item.code)
+                                    item.code),
+                                imageLargeUrl : pkgScreenshot.url(
+                                    $scope.pkg,
+                                    item.code,
+                                    SCREENSHOT_MAX_TARGETHEIGHT,
+                                    SCREENSHOT_MAX_TARGETHEIGHT)
                             };
                         });


==============================================================================
Revision: 0423e8940a79
Author:   Andrew Lindesay <apl@xxxxxxxxxxxxxx>
Date:     Tue Feb 25 11:12:41 2014 UTC
Log:      + screenshot alignment / viewing tweaks

http://code.google.com/p/haiku-depot-web-app/source/detail?r=0423e8940a79

Modified:
 /haikudepotserver-webapp/src/main/webapp/css/viewpkg.css

=======================================
--- /haikudepotserver-webapp/src/main/webapp/css/viewpkg.css Tue Feb 18 00:02:17 2014 UTC +++ /haikudepotserver-webapp/src/main/webapp/css/viewpkg.css Tue Feb 25 11:12:41 2014 UTC 
@@ -27,6 +27,12 @@
     position: relative;
     background-color: #EEE;
 }
+
+#pkg-screenshot-container > img {
+    margin-left: auto;
+    margin-right: auto;
+    display: block;
+}

 #pkg-screenshot-title {
     background-color: #444;

==============================================================================
Revision: 944002805b1f
Author:   Andrew Lindesay <apl@xxxxxxxxxxxxxx>
Date:     Wed Feb 26 09:35:17 2014 UTC
Log:      + screenshot editing; ability to order the screenshots

http://code.google.com/p/haiku-depot-web-app/source/detail?r=944002805b1f

Added:
 /haikudepotserver-webapp/src/main/webapp/img/down.svg
 /haikudepotserver-webapp/src/main/webapp/img/up.svg
Modified:
/haikudepotserver-webapp/src/main/java/org/haikuos/haikudepotserver/api1/PkgApiImpl.java 
 /haikudepotserver-webapp/src/main/webapp/css/editpkgscreenshots.css
/haikudepotserver-webapp/src/main/webapp/js/app/controller/editpkgscreenshots.html /haikudepotserver-webapp/src/main/webapp/js/app/controller/editpkgscreenshotscontroller.js /haikudepotserver-webapp/src/main/webapp/js/app/service/errorhandlingservice.js 

=======================================
--- /dev/null
+++ /haikudepotserver-webapp/src/main/webapp/img/down.svg Wed Feb 26 09:35:17 2014 UTC 
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg";
+   version="1.1"
+   width="12"
+   height="12">
+<path fill="black" stroke="none" d="M4.5 0.5 L7.5 0.5 L7.5 4.5 L11.5 4.5 L6 11.5 L0.5 4.5 L4.4 4.5 Z"/> 
+</svg>
=======================================
--- /dev/null
+++ /haikudepotserver-webapp/src/main/webapp/img/up.svg Wed Feb 26 09:35:17 2014 UTC 
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg";
+   version="1.1"
+   width="12"
+   height="12">
+<path fill="black" stroke="none" d="M4.5 11.5 L7.5 11.5 L7.5 7.5 L11.5 7.5 L6 0.5 L0.5 7.5 L4.4 7.5 Z"/> 
+</svg>
=======================================
--- /haikudepotserver-webapp/src/main/java/org/haikuos/haikudepotserver/api1/PkgApiImpl.java Mon Feb 24 10:10:13 2014 UTC +++ /haikudepotserver-webapp/src/main/java/org/haikuos/haikudepotserver/api1/PkgApiImpl.java Wed Feb 26 09:35:17 2014 UTC 
@@ -535,6 +535,6 @@
logger.info("did reorder the screenshots on package {}", pkg.getName()); 

-        return null;
+        return new ReorderPkgScreenshotsResult();
     }
 }
=======================================
--- /haikudepotserver-webapp/src/main/webapp/css/editpkgscreenshots.css Tue Feb 18 00:02:17 2014 UTC +++ /haikudepotserver-webapp/src/main/webapp/css/editpkgscreenshots.css Wed Feb 26 09:35:17 2014 UTC 
@@ -9,7 +9,12 @@
     background-color: #EEE;
 }

-#pkg-screenshots-list > div > img {
+#pkg-screenshots-list > div .pkg-screenshot-image-container {
+    position: relative;
+    display: inline;
+}
+
+#pkg-screenshots-list > div .pkg-screenshot-image-container > img {
     float: left;
     border: 1px solid black;
 }
@@ -20,5 +25,17 @@
     padding-bottom: 4px;
 }

+#pkg-screenshots-list > div .pkg-screenshot-actions-container {
+    padding-top:2px;
+    padding-bottom:2px;
+    padding-left:4px;
+    padding-right:4px;
+ position: absolute; /* assumes that this is inside a 'pkg-screenshot-title' */ 
+    top: 1px;
+    right: 1px;
+    background-color: rgb(253,207,49);
+    border-bottom-left-radius: 4px;
+    display: inline;
+}


=======================================
--- /haikudepotserver-webapp/src/main/webapp/js/app/controller/editpkgscreenshots.html Tue Feb 18 09:54:04 2014 UTC +++ /haikudepotserver-webapp/src/main/webapp/js/app/controller/editpkgscreenshots.html Wed Feb 26 09:35:17 2014 UTC 
@@ -17,9 +17,15 @@
         </form>
     </div>

-    <div id="pkg-screenshots-list">
+    <div id="pkg-screenshots-list" ng-model="pkgScreenshots">
         <div ng-repeat="pkgScreenshot in pkgScreenshots">
-            <img ng-src="{{pkgScreenshot.imageThumbnailUrl}}"></img>
+            <div class="pkg-screenshot-image-container">
+                <img ng-src="{{pkgScreenshot.imageThumbnailUrl}}"></img>
+ <div class="pkg-screenshot-actions-container" ng-show="pkgScreenshots.length > 1"> + <a href="" ng-show="0!=$index" ng-click="goOrderUp(pkgScreenshot)"><img src="/img/up.svg"></a> + <a href="" ng-show="$index < pkgScreenshots.length-1" ng-click="goOrderDown(pkgScreenshot)"><img src="/img/down.svg"></a> 
+                </div>
+            </div>
             <div class="pkg-screenshot-controls">
<div><strong>#{{$index+1}}</strong> - ({{pkgScreenshot.width}} x {{pkgScreenshot.height}}), {{pkgScreenshot.length|dataLength}}</div> 

=======================================
--- /haikudepotserver-webapp/src/main/webapp/js/app/controller/editpkgscreenshotscontroller.js Tue Feb 18 09:54:04 2014 UTC +++ /haikudepotserver-webapp/src/main/webapp/js/app/controller/editpkgscreenshotscontroller.js Wed Feb 26 09:35:17 2014 UTC 
@@ -195,6 +195,73 @@
                     }
                 );
             }
+
+            // -------------------------
+            // ORDERING
+
+            function storeOrdering() {
+
+                $scope.amCommunicating = true;
+
+                jsonRpc.call(
+                        constants.ENDPOINT_API_V1_PKG,
+                        "reorderPkgScreenshots",
+                        [{
+                            pkgName : $scope.pkg.name,
+ codes: _.map($scope.pkgScreenshots, function(s) { return s.code; }) 
+                        }]
+                    ).then(
+                    function() {
+ $log.info('did re-order screenshots for package '+$scope.pkg.name); 
+                        $scope.amCommunicating = false;
+                    },
+                    function(err) {
+                        errorHandling.handleJsonRpcError(err);
+                    }
+                );
+            }
+
+            $scope.goOrderUp = function(pkgScreenshot) {
+                var i = _.indexOf($scope.pkgScreenshots, pkgScreenshot);
+
+                switch(i) {
+
+                    case -1:
+ throw 'unable to find the screenshot to re-order in the list of screenshots'; 
+
+                    case 0:
+                        // already at the start
+                        break;
+
+                    default:
+                        var earlier = $scope.pkgScreenshots[i-1];
+                        $scope.pkgScreenshots[i-1] = pkgScreenshot;
+                        $scope.pkgScreenshots[i] = earlier;
+                        storeOrdering();
+                        break;
+                }
+            }
+
+            $scope.goOrderDown = function(pkgScreenshot) {
+                var i = _.indexOf($scope.pkgScreenshots, pkgScreenshot);
+
+                switch(i) {
+
+                    case -1:
+ throw 'unable to find the screenshot to re-order in the list of screenshots'; 
+
+                    case $scope.pkgScreenshots.length-1:
+                        // already at the end
+                        break;
+
+                    default:
+                        var later = $scope.pkgScreenshots[i+1];
+                        $scope.pkgScreenshots[i+1] = pkgScreenshot;
+                        $scope.pkgScreenshots[i] = later;
+                        storeOrdering();
+                        break;
+                }
+            }

         }
     ]
=======================================
--- /haikudepotserver-webapp/src/main/webapp/js/app/service/errorhandlingservice.js Sun Feb 9 10:00:28 2014 UTC +++ /haikudepotserver-webapp/src/main/webapp/js/app/service/errorhandlingservice.js Wed Feb 26 09:35:17 2014 UTC 
@@ -20,8 +20,8 @@
$log.error(prefix+'cause is unknown as no error envelope was available'); 
                     }
                     else {
- var code = jsonRpcErrorEnvelope.code ? jsonRpcErrorEnvelope.code : '?'; - var message = jsonRpcErrorEnvelope.message ? jsonRpcErrorEnvelope.message : '?'; + var code = jsonRpcErrorEnvelope.error.code ? jsonRpcErrorEnvelope.error.code : '?'; + var message = jsonRpcErrorEnvelope.error.message ? jsonRpcErrorEnvelope.error.message : '?'; 
                         $log.error(prefix+'code:'+code+", msg:"+message);
                     }
                 },

==============================================================================
Revision: cef96db7d23a
Author:   Andrew Lindesay <apl@xxxxxxxxxxxxxx>
Date:     Wed Feb 26 09:41:41 2014 UTC
Log:      + screenshot editing; small tweak

http://code.google.com/p/haiku-depot-web-app/source/detail?r=cef96db7d23a

Modified:
/haikudepotserver-webapp/src/main/webapp/js/app/controller/editpkgscreenshotscontroller.js 

=======================================
--- /haikudepotserver-webapp/src/main/webapp/js/app/controller/editpkgscreenshotscontroller.js Wed Feb 26 09:35:17 2014 UTC +++ /haikudepotserver-webapp/src/main/webapp/js/app/controller/editpkgscreenshotscontroller.js Wed Feb 26 09:41:41 2014 UTC 
@@ -20,7 +20,7 @@
             var SCREENSHOT_SIZE_LIMIT = 2 * 1024 * 1024; // 2MB

             var THUMBNAIL_TARGETWIDTH = 180;
-            var THUMBNAIL_TARGETHEIGHT = 90;
+            var THUMBNAIL_TARGETHEIGHT = 180;

             $scope.breadcrumbItems = undefined;
             $scope.pkg = undefined;

Other related posts:

  • » [haiku-depot-web] [haiku-depot-web-app] 4 new revisions pushed by haiku.li...@xxxxxxxxx on 2014-02-26 18:33 GMT - haiku-depot-web-app
  1. Home
  2. haiku-depot-web
  3. Archive
  4. 02-2014