From d1644dcbc07f0ad493fd4733f3a71bf0a4b0cce9 Mon Sep 17 00:00:00 2001 From: jendib Date: Fri, 16 Aug 2013 17:14:50 +0200 Subject: [PATCH] Loading feedback --- docs-parent/TODO | 1 - .../webapp/app/docs/controller/Navigation.js | 6 +- docs-web/src/main/webapp/img/loader.gif | Bin 0 -> 1849 bytes docs-web/src/main/webapp/index.html | 4 + .../webapp/partial/docs/document.view.html | 82 +++++++++--------- .../src/main/webapp/partial/docs/tag.html | 6 +- docs-web/src/main/webapp/style/main.less | 10 +++ 7 files changed, 67 insertions(+), 42 deletions(-) create mode 100644 docs-web/src/main/webapp/img/loader.gif diff --git a/docs-parent/TODO b/docs-parent/TODO index 6615600d..e69de29b 100644 --- a/docs-parent/TODO +++ b/docs-parent/TODO @@ -1 +0,0 @@ -- Loading feedback for document (list), document.view, tag.default diff --git a/docs-web/src/main/webapp/app/docs/controller/Navigation.js b/docs-web/src/main/webapp/app/docs/controller/Navigation.js index 01b8323d..8d11ae00 100644 --- a/docs-web/src/main/webapp/app/docs/controller/Navigation.js +++ b/docs-web/src/main/webapp/app/docs/controller/Navigation.js @@ -3,7 +3,7 @@ /** * Navigation controller. */ -App.controller('Navigation', function($scope, $state, $rootScope, User, Restangular) { +App.controller('Navigation', function($scope, $http, $state, $rootScope, User, Restangular) { $rootScope.userInfo = User.userInfo(); /** @@ -16,4 +16,8 @@ App.controller('Navigation', function($scope, $state, $rootScope, User, Restangu }); $event.preventDefault(); }; + + $scope.isLoading = function() { + return $http.pendingRequests.length > 0; + }; }); \ No newline at end of file diff --git a/docs-web/src/main/webapp/img/loader.gif b/docs-web/src/main/webapp/img/loader.gif new file mode 100644 index 0000000000000000000000000000000000000000..5b33f7e54f4e55b6b8774d86d96895db9af044b4 GIT binary patch literal 1849 zcma*odr(tX9tZI2z31lM+(&YVk%mZ}5P~KlG2s=WSbGzm0!x7^P##Mnh7t-jP!X0Q zk_SQ}Po-L1tlDK;6l?(>v)e5ZBQx4|Y-Q?nr@Px3?9h(3ZWr3^tj=`TP57gKr87N$ zp2wWee1GRRCwo_xahnw)5cxNPJbCg2L6DV|6`#+yw6v6!mDS$f9-JvFD^n;GQ&UrZ zzh5jCkByB101O60U0q#p_1BM>Cv-vP?&s4@g_((4_1L=L$(a91)0=J91Gas#R{McE znYG^9*0A5YZ>#;~+Wkn(W5B0^yELIYLP!K}mB~<)AM@1&nqekynuaEGqPrzoH|KodRXJy)%+w_fu3nE5>@Bd_b zqC$EQ;{c`T&?EsNO|igL9gC7Ygxv?aQUEXMq?~>wg{EyW;VcJ37CUF#HjrT=KQO_* zS>M9yydXk18D(+QDJ1>r);Lav_uYKp$T?4vr{Q$lTo&pKv^?(>L-)G2*lwH!Ah7k? z7oH<8h-(KTKt5V6$8gF)C7Io&P5=SjTh)=zV=E2EUhQZP##L8S{d%UK>>+y82>+FV+#^BzW7u3F)Bb>=lYQ%%j`F>ASe zo*cw@V#u6T`A2He;70mR(V&iV&-7{qP~=SRf&jm9-T{*ZeZ}$rd0#6c&fLG^xJcf5 z+p<`wJYgW+_s*V{uI$nMB;%8`S_3>PfGOj3Rq}@Cx^+j?rk92fANSFDBYnOqQ>Vdj z)(|$AhP4t&Lb=Gvo2#3Gl%9<=Gv`Mz?Po@P4iLF!x}GUWJICDlFk-hS^Whyh7x~VH z@0vD1>HYD4&e+~yzS*-sFR{9`{QEEZO1zg7>R&7cHts-6j!xHVdA8eI+ZlVzd%`es zJT@$#GX(gvCJ1oJN%yLBK}{V=V;seo;!w|Yte!W1%5qLNFWqvZW>h&IiH+oPT=b@E zPhGzv5=(Un*X>v`>%8h_nj^NdYcE6NHS_ifkCV$*D)Tqrbu`s;<=t<4 zAHNqNV?6(g<1PY-w@#I-WYFViz?9TrkMr)u0g`O`u|>T;k|2sV*YF^punvT;$SuTy{j3Gv)yqD!R_CF>yR)MzmmYS5v+~R zXAdD%ng9?df;wd8GxR#%3O+gz};Vo;)sK%Bj-q>Oq%R7JU-KD?vYu>#2UjaDo z&8$>5xW~?KPD_#XFToU1hIb*VOMidUr6iYiO0N|i-7s`T8!cFT`rN!^1Pt78J93i6 z5HI1wIM$94m{3SLDvISDe6$ZG1;eq_D9RTaaC>=cO{@Bs>$IlPCPJJ$h$)-3vzNUQ6OsN#_zWxey!_9%hxwH2_dEJi=yY|1c7nDm2_Lm!Cof8-R_+9UkS zcBE(o47yE)oMR(Q=dp1a2wTX5KvvGyLqlWTa7V&!A*|w|)ax~1_~aJ0=_Lilg*0iQk7#ZD EAHN$8j{pDw literal 0 HcmV?d00001 diff --git a/docs-web/src/main/webapp/index.html b/docs-web/src/main/webapp/index.html index 0318c5fa..6379ae6c 100644 --- a/docs-web/src/main/webapp/index.html +++ b/docs-web/src/main/webapp/index.html @@ -60,6 +60,10 @@
+
+ +
+ Sismics Docs
    diff --git a/docs-web/src/main/webapp/partial/docs/document.view.html b/docs-web/src/main/webapp/partial/docs/document.view.html index 4fbad6c8..23441a8c 100644 --- a/docs-web/src/main/webapp/partial/docs/document.view.html +++ b/docs-web/src/main/webapp/partial/docs/document.view.html @@ -1,40 +1,44 @@ -
    -
    - - -
    -
    + -
    -

    {{ document.title }} {{ document.create_date | date: 'yyyy-MM-dd' }}

    -

    - - -

    -
      -
    • {{ tag.name }}
      • -
    -
    - -

    - -
      -
    • -
      - - - -
      -
      -
      -
      -

      - -

      -
      -
      -
      -
      • -
    - -
    \ No newline at end of file +
    +
    +
    + + +
    +
    + +
    +

    {{ document.title }} {{ document.create_date | date: 'yyyy-MM-dd' }}

    +

    + + +

    +
      +
    • {{ tag.name }}
      • +
    +
    + +

    + +
      +
    • +
      + + + +
      +
      +
      +
      +

      + +

      +
      +
      +
      +
      • +
    + +
    +
    \ No newline at end of file diff --git a/docs-web/src/main/webapp/partial/docs/tag.html b/docs-web/src/main/webapp/partial/docs/tag.html index 665ff64c..8082fd39 100644 --- a/docs-web/src/main/webapp/partial/docs/tag.html +++ b/docs-web/src/main/webapp/partial/docs/tag.html @@ -27,12 +27,16 @@
-
+

{{ tags.length }} tag{{ tags.length > 1 ? 's' : '' }}

{{ stat.name }} {{ stat.count }}
+ +
+ +
\ No newline at end of file diff --git a/docs-web/src/main/webapp/style/main.less b/docs-web/src/main/webapp/style/main.less index 0aba6508..b7299d7d 100644 --- a/docs-web/src/main/webapp/style/main.less +++ b/docs-web/src/main/webapp/style/main.less @@ -43,6 +43,16 @@ } } +// $http loader +.loader { + position: relative; + top: -2px; + + &.hide { + visibility: hidden; + } +} + // Tags list .table-tags { tbody td {