[Kimchi-devel] [PATCH] Adding Admin New Custom Backup history

Daniel Henrique Barboza danielhb at linux.vnet.ibm.com
Mon Dec 7 12:43:16 UTC 2015


Please forward this patch and any other gingerbase patches to

ginger-dev-list at googlegroups.com


Thanks!

On 12/03/2015 06:39 PM, sguimaraes943 at gmail.com wrote:
> From: Andre Teodoro <andreteodoro.work at gmail.com>
>
> Signed-off-by: Andre Teodoro <andreteodoro.work at gmail.com>
> Signed-off-by: samhenri <samuel.guimaraes at eldorado.org.br>
> ---
>   ui/css/src/modules/_administration.scss |  54 +++++++++++++++++++++++++++++++-
>   ui/js/host-admin.js                     | Bin 34874 -> 35478 bytes
>   ui/pages/host-admin.html.tmpl           |  31 ++++++++++++------
>   3 files changed, 74 insertions(+), 11 deletions(-)
>
> diff --git a/ui/css/src/modules/_administration.scss b/ui/css/src/modules/_administration.scss
> index 84479f1..75caf7c 100644
> --- a/ui/css/src/modules/_administration.scss
> +++ b/ui/css/src/modules/_administration.scss
> @@ -218,12 +218,16 @@
>           list-style-type: none;
>       }
>       .column-file {
> -        width: 58.9790%;
> +        width: 47.4790%;
>           word-wrap: break-word;
>       }
>       .column-timestamp {
>           width: 18.9608%;
>       }
> +    .column-paths {
> +        width: 11.5000%;
> +        vertical-align: middle;
> +    }
>       .column-download {
>           width: 11.0300%;
>       }
> @@ -240,6 +244,54 @@
>       .backup-pcc-button {
>           height: 40px;
>       }
> +    .backup-history {
> +        width: 100%;
> +        background: $navbar-default-toggle-hover-bg;
> +        padding: 15px !important;
> +    }
> +    .backup-history-list {
> +        max-height: 285px;
> +        min-height: 136px;
> +        overflow: auto;
> +        background: $gray-lighter;
> +        padding: 10px 15px;
> +    }
> +    .bkp-paths-header {
> +        font-weight: 400;
> +    }
> +    .bkp-paths-body {
> +        font-weight: 600;
> +    }
> +    .column-description,
> +    .column-paths-included,
> +    .column-paths-excluded {
> +        color: #9e9e9e;
> +        word-wrap: break-word;
> +    }
> +    .column-description {
> +        width: 47.4790%;
> +    }
> +    .column-paths-included {
> +        width: 20%;
> +    }
> +    .column-paths-excluded {
> +        width: 20%;
> +    }
> +    .arrow-down,
> +    .arrow-up {
> +        display: inline-block;
> +        font: normal normal normal 14px/1 FontAwesome;
> +        font-size: inherit;
> +        text-rendering: auto;
> +        -webkit-font-smoothing: antialiased;
> +        -moz-osx-font-smoothing: grayscale;
> +    }
> +    .arrow-down:before {
> +        content: "\f078";
> +    }
> +    .arrow-up:before {
> +        content: "\f077";
> +    }
>   }
>
>   #backup-pcc-action-area {
> diff --git a/ui/js/host-admin.js b/ui/js/host-admin.js
> index d43bd3c9326be081be832fb3c41d0a0e4a43b460..e784979bffb0fec07be9bfd26147c468f6ceb14a 100644
> GIT binary patch
> delta 743
> zcmZ{izi-n(6vvgQ!NG{cBu+~OC~g#VKG9g}(xn0c?SO>Df at p<c$i=?arp}#fUm6gq
> zpkhbB6AVa*PHae(EHQLq;E!Nn;V-DzI&x?7iwHc}r|<i|_dfTYk6z{9z0DuK*K!nY
> zH!xU!0X}LPoUE7ABkfxbK5bOt^ZGnI-_W36Ey1OV23PK0fCF5D5BE!;>9c7=e_4dJ
> z%k}iI^5yI;YvO6z4W~og?OxRKgGBK7Nh_4!#-b%?H at d?;iX9R~lzFz`JQP8+%9)@{
> z;1xYRS!n0$`mkElMh=N%-bdKs%tme)xZ4PRnN9f7o`YjH2VZM5%Sjk`)VgXZ``?|>
> zq7;S1z)nPB*~1<mVE;w6B77nopCqdxNfH|c48hJ$?R+M?O7Us1<qKH{k)Ggh3=_KK
> z%;}L`3D<8H7kt9D=naKxkDyx~?=zXHiebnZ)!7Wx$=+)+W}_sOcZ2pr+nfm9i-v*y
> zQ*}64Dwqm#iUz^!$0i&vmBBD(&SkvB^QO7#|K#dLBPzq22NoCM!Nu}3cWjo!-0U$|
> z1aj)U^9Wl{vz-K+mb{)4CT5l`=+9m8(5MzTFvhgYcj*9Z((8<QGg)g%F8L3@&qD3m
> W|C5zzI(5)}C4=14_tH-DyZakVXY!o@
>
> delta 415
> zcmZWize>YE7{?NA8!R-Y+71QJSfpZFVmk;Kq#`&;MG$e5*j(D9m)zByf*?3LTKUky
> z$rliWfP<qCV3*E{h>zgzwNwZDP2cbT?M>{t8+*KqL#?gA`+h>%!=Z?J@&3f{gU<Ra
> zycKf5D+*W#3Owj3-QgSuZjn2pRc9_9B&2T<E>4q>Ruy=)r=X`Lz*0wbYwA at Z`kHx4
> z!6(ux4MtD=pyUyX&GHBc;>#At=Z1*{_W7W9xhxo?g76~jPV1VaLmL%}e==ORGlzk|
> zfw0lYxygpuRMEft)u|K85~E3iCO$5?#G$NdjN3U2i6AVnVPQL)_RnO5Vo%5!UaA_<
> zt;}T{xjH0Qsunt8LNMQe^m$IBl!SvQGCWGSM+9ul>-q7G7ICqSRxL|~k6Iq?cP686
> SRFA<{Jq!8EWYk}JY5V}-A%?mD
>
> diff --git a/ui/pages/host-admin.html.tmpl b/ui/pages/host-admin.html.tmpl
> index 7e197bf..24a3649 100644
> --- a/ui/pages/host-admin.html.tmpl
> +++ b/ui/pages/host-admin.html.tmpl
> @@ -99,16 +99,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
>               <li class="header">
>                       <span class="column-file">$_("File")</span><!--
>                       --><span class="column-timestamp">$_("Timestamp")</span><!--
> +                    --><span class="column-paths">$_("Paths")</span><!--
>                   --><span class="column-download" style="display:none">
>                           <span class="sr-only">Download</span><!--
>                       --></span><!--
>                   --><span class="column-delete" style="display:none">
>                           <span class="sr-only">Delete</span><!--
>                       --></span>
> -                </li>
> -                <li>
> -                 <ul class="ul-body" id="bakGridBody"></ul>
> -             </li>
> +            </li>
> +            <li>
> +                <ul class="ul-body" id="bakGridBody"></ul>
> +            </li>
>            </ul>
>            <hr>
>           </div>
> @@ -425,19 +426,29 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
>
>   </div>
>   <script id="backupItem" type="text/html">
> -    <li class="body" name="backupBodyItem" id="{identity}">
> +    <li class="body in" name="backupBodyItem" id="{identity}">
>           <span class="column-file">{file}</span><!--
>           --><span class="column-timestamp">{timestamp}</span><!--
> +        --><span class="column-paths">
> +            <div class="arrow arrow-down"></div>
> +        </span><!--
>           --><span class="column-download btn btn-link btn-download"><i class="fa fa-download"></i>$_("Download")</span><!--
>           --><span class="column-delete btn btn-link btn-delete "><i class="fa fa-minus-circle"></i>$_("Remove")</span>
> +        <div class="backup-history" style="display: none;">
> +            <div class="backup-history-list" ></div>
> +        </div>
>       </li>
>   </script>
>   <script id="backupTooltip" type="text/html">
> -    <div class="header">$_("Description")</div>
> -    <div class="sub-content">{description}</div>
> -    <div class="crt-bak-section">
> -    <div class="path-pick"><div class="header">$_("Path Included")</div><div class="sub-content">includePlaceHodler</div></div>
> -    <div class="path-pick"><div class="header">$_("Path Excluded")</div><div class="sub-content">excludePlaceHodler</div></div>
> +    <div class="row bkp-paths-header" style="display: -webkit-box;">
> +        <div class="column-description">$_("Description")</div>
> +        <div class="column-paths-included">$_("Paths Included")</div>
> +        <div class="column-paths-excluded">$_("Paths Excluded")</div>
> +    </div>
> +    <div class="row bkp-paths-body" style="display: -webkit-box;">
> +        <div class="column-description">{description}</div>
> +        <div class="column-paths-included">includePlaceHodler</div>
> +        <div class="column-paths-excluded">excludePlaceHodler</div>
>       </div>
>   </script>
>   <script id="pathItem" type="text/html">




More information about the Kimchi-devel mailing list