Commit 86d20121 authored by Jerome Chauveau's avatar Jerome Chauveau
Browse files

remplacement navigation-drawer par container simple & colonnage.

parent a5fa2489

src/components/JamaCollection.vue

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ export default { 
<style lang="scss" scoped>

.collection-title{

  display: inline-block;

  max-width:25vw !important;

  max-width:18vw !important;

}

src/components/JamaResource.vue

+1 −1
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ export default { 


.resource-title{

  display: inline-block;

  max-width:25vw !important;

  max-width:18vw !important;

}



</style>

src/components/VueJama.vue

+28 −20
Original line number Diff line number Diff line 
<template>

  <v-row v-if="permissionsReady" class="ma-0 flex-grow-1 main-row">

    <v-navigation-drawer

        v-if="currentCollection"

        v-model="treeDrawer"

        app

    <v-col :cols="treeDrawerCols"

           class="pa-0 ma-0 jama-tree-drawer-cols"

           v-if="currentCollection && treeDrawer"

    >

      <collections-tree @collection-selected="loadCollectionById"/>

    </v-navigation-drawer>

    </v-col>





    <v-col :cols="sidePaneVisible ? (rightPaneMaximized ? 6 : 8) : 12" class="pa-0 d-flex">

    <v-col :cols="mainPaneCols" class="pa-0 d-flex">

      <div class="d-flex flex-column flex-grow-1">



        <!--toolbar -->
@@ -21,7 +20,7 @@ 
          >

            <v-icon>mdi-{{ `chevron-${treeDrawer ? 'left' : 'right'}` }}</v-icon>

          </v-btn>

<!--          <v-app-bar-nav-icon v-if="currentCollection" @click.stop="treeDrawer = !treeDrawer" />-->



          <h2 class="d-flex align-center">

            <span class="jama-app-title">{{ appTitle }}</span>

            <template v-if="appSubtitle && !isPickerMode">
@@ -150,17 +149,7 @@ 
                                             @resource-selected="resourceSelected"

                  />





<!--                  <v-container v-if="nbPages > 1" class="d-flex flex-grow-0 bottom-pagination">-->

<!--                    <v-col :cols="sidePaneVisible ? (rightPaneMaximized ? 6 : 8) : 12">-->

<!--                      <v-pagination-->

<!--                          v-model="currentPage"-->

<!--                          :length="nbPages"-->

<!--                          @input="gotoPage"-->

<!--                      ></v-pagination>-->

<!--                    </v-col>-->

<!--                  </v-container>-->

                    <v-col v-if="nbPages > 1" :cols="sidePaneVisible ? (rightPaneMaximized ? 6 : 8) : 12"

                    <v-col v-if="nbPages > 1" :cols="paginatorCols"

                           class=" d-flex bottom-pagination ma-0 pa-0">

                      <v-container class="d-flex justify-end ma-0 pa-0">

                        <v-col cols="6">
@@ -173,7 +162,7 @@ 
                          </v-row>

                        </v-col>

                        <v-col cols="2">

                          <v-row>

                          <v-row class="pr-2 mr-2">

                            <v-select class="ml-5 pr-5" :items="[10,25,50]" v-model="pageLength"

                                      @change="reloadCurrentCollection()"></v-select>

                          </v-row>
@@ -202,7 +191,7 @@ 
      </div>

    </v-col>



    <v-col v-if="sidePaneVisible" :cols="rightPaneMaximized ? 6 : 4" class="d-flex pa-0 jama-side-pane">

    <v-col v-if="sidePaneVisible" :cols="rightPaneCols" class="d-flex pa-0 jama-side-pane">

      <button v-if="!rightPaneMaximized"

              class="jama-divider-to jama-divider-to-left"

              title="Agrandir le panneau latéral"
@@ -407,6 +396,21 @@ export default { 


    },



    rightPaneCols(){

      return this.sidePaneVisible ? (this.rightPaneMaximized ? 5 : 3) : 0;

    },

    treeDrawerCols(){

      return this.treeDrawer ? 2 : 0;

    },

    mainPaneCols(){

      let c = this.sidePaneVisible ? (this.rightPaneMaximized ? 5 : 7) : 10;

      return this.treeDrawer && this.currentCollection ? c : c + 2;

    },



    paginatorCols(){

      return this.treeDrawerCols + this.mainPaneCols

    },



    ...mapGetters([

      "appTitle",

      "appSubtitle",
@@ -779,6 +783,10 @@ header { 
  border-width: 2px;

}



.jama-tree-drawer-cols{

  border-right: 1px solid #BBB;

}



.bottom-pagination {

  position: fixed;

  bottom: 0;