Author: sevein
Date: Thu Apr 5 18:52:15 2012
New Revision: 11405
Log:
Simplification of new treeview markup/css
Modified:
branches/2.0/apps/qubit/modules/informationobject/templates/_treeView.php
branches/2.0/plugins/qtDominionPlugin/Makefile
branches/2.0/plugins/qtDominionPlugin/css/less/_archivaldescription.less
branches/2.0/plugins/qtDominionPlugin/css/less/_treeview.less
branches/2.0/plugins/qtDominionPlugin/css/less/main.css
Modified:
branches/2.0/apps/qubit/modules/informationobject/templates/_treeView.php
==============================================================================
--- branches/2.0/apps/qubit/modules/informationobject/templates/_treeView.php
Thu Apr 5 18:51:10 2012 (r11404)
+++ branches/2.0/apps/qubit/modules/informationobject/templates/_treeView.php
Thu Apr 5 18:52:15 2012 (r11405)
@@ -1,39 +1,16 @@
-<div class="span5 tree tab-pane active" id="holdings">
+<div class="span5 tree tab-pane active" id="treeview">
<ul class="unstyled">
<?php if (true): ?>
- <li class="back"><?php echo link_to(__('Show all'), array(),
array('class' => 'arrow-left')) ?></li>
+ <li class="back"><i></i><?php echo link_to(__('Show all'), array(),
array('class' => 'arrow-left')) ?></li>
<?php endif; ?>
- <li class="up"><a href="#"><i class="arrow-down"></i>Forest History of
British Columbia <strong>Fonds</strong></a></li>
- <li class="up"><a href="#"><i class="arrow-down"></i>Frasier Valley
<strong>Series</strong></a></li>
- <li class="expand"><a href="#"><i class="arrow-right"></i>Douglas Coupland
<strong>File</strong></a></li>
- <li><a href="#">Charles Xingpeau <strong>File</strong></a></li>
- <li class="expand"><a href="#"><i class="arrow-right"></i>Forest History
of British Columbia <strong>File</strong></a></li>
- <li class="expand"><a href="#"><i class="arrow-right"></i>The Maritime
Museum designated City Archives <strong>File</strong></a></li>
- <li class="expand"><a href="#"><i class="arrow-right"></i>Douglas Coupland
<strong>File</strong></a></li>
- <li class="active"><a href="#" >Douglas Coupland
<strong>File</strong></a></li>
- <li class="expand" ><a href="#"><i class="arrow-right"></i>Douglas
Coupland <strong>File</strong></a></li>
- <li class="expand"><a href="#"><i class="arrow-right"></i>Douglas Coupland
<strong>File</strong></a></li>
- <li class="expand"><a href="#"><i class="arrow-right"></i>Douglas Coupland
<strong>File</strong></a></li>
- <li class="expand"><a href="#"><i class="arrow-right"></i>Douglas Coupland
<strong>File</strong></a></li>
- <li><a href="#">Charles Xingpeau <strong>File</strong></a></li>
- <li class="expand"><a href="#"><i class="arrow-right"></i>Forest History
of British Columbia <strong>File</strong></a></li>
- <li class="expand"><a href="#"><i class="arrow-right"></i>Douglas Coupland
<strong>File</strong></a></li>
- <li class="expand"><a href="#"><i class="arrow-right"></i>Douglas Coupland
<strong>File</strong></a></li>
- <li><a href="#">Douglas Coupland <strong>File</strong></a></li>
- <li class="expand"><a href="#"><i class="arrow-right"></i>Douglas Coupland
<strong>File</strong></a></li>
- <li class="expand"><a href="#"><i class="arrow-right"></i>Douglas Coupland
<strong>File</strong></a></li>
- <li class="expand"><a href="#"><i class="arrow-right"></i>Douglas Coupland
<strong>File</strong></a></li>
- <li class="expand"><a href="#"><i class="arrow-right"></i>Douglas Coupland
<strong>File</strong></a></li>
- <li><a href="#">Charles Xingpeau <strong>File</strong></a></li>
- <li class="expand"><a href="#"><i class="arrow-right"></i>Forest History
of British Columbia <strong>File</strong></a></li>
- <li class="expand"><a href="#"><i class="arrow-right"></i>The Society of
Composers, Authors and Publishers <strong>File</strong></a></li>
- <li class="expand"><a href="#"><i class="arrow-right"></i>International
Federation of the Phonographic Industry <strong>File</strong></a></li>
- <li class="expand"><a href="#"><i class="arrow-right"></i>International
Federation of the Phonographic Industry – Chile <strong>File</strong></a></li>
- <li class="expand"><a href="#"><i class="arrow-right"></i>Bulgarian
Association of Music Producers <strong>File</strong></a></li>
- <li class="expand"><a href="#"><i class="arrow-right"></i>Final
International Federation of the Phonographic Industry
<strong>File</strong></a></li>
+ <li class="up"><a href="#"><i></i>Foobar <strong>Fonds</strong></a></li>
+
+ <li class="expand"><a href="#"><i></i>Douglas Coupland
<strong>File</strong></a></li>
+
+ <li class=""><a href="#"><i></i>Charles Xingpeau
<strong>File</strong></a></li>
</ul>
Modified: branches/2.0/plugins/qtDominionPlugin/Makefile
==============================================================================
--- branches/2.0/plugins/qtDominionPlugin/Makefile Thu Apr 5 18:51:10
2012 (r11404)
+++ branches/2.0/plugins/qtDominionPlugin/Makefile Thu Apr 5 18:52:15
2012 (r11405)
@@ -1,9 +1,5 @@
-all: less bootstrap
+all: less
less:
@echo "Running LESS compiler..."
../../vendor/less/bin/lessc --compress css/main.less > css/less/main.css
-
-bootstrap:
- @echo "Merging Twitter Bootstrap js files..."
- bash -c "cat vendor/bootstrap/js/*.js > vendor/bootstrap.js"
Modified:
branches/2.0/plugins/qtDominionPlugin/css/less/_archivaldescription.less
==============================================================================
--- branches/2.0/plugins/qtDominionPlugin/css/less/_archivaldescription.less
Thu Apr 5 18:51:10 2012 (r11404)
+++ branches/2.0/plugins/qtDominionPlugin/css/less/_archivaldescription.less
Thu Apr 5 18:52:15 2012 (r11405)
@@ -1,4 +1,5 @@
#navigation {
+
position:fixed; top:0; width:250px;
height:100%; overflow-y: hidden; overflow-x:hidden;
z-index: 100;
@@ -51,6 +52,7 @@
}
#mediadisplay {
+
background-color: @black;
padding:10px;
color:@white;
Modified: branches/2.0/plugins/qtDominionPlugin/css/less/_treeview.less
==============================================================================
--- branches/2.0/plugins/qtDominionPlugin/css/less/_treeview.less Thu Apr
5 18:51:10 2012 (r11404)
+++ branches/2.0/plugins/qtDominionPlugin/css/less/_treeview.less Thu Apr
5 18:52:15 2012 (r11405)
@@ -61,33 +61,31 @@
}
- }
-
- }
-
- [class^="arrow-"] {
+ &.up i,
+ &.back i,
+ &.expand i {
+
+ display: inline-block;
+ width: 10px;
+ height: 10px;
+ vertical-align: middle;
+ margin-right: 3px;
+ background-image: url(../../images/arrow-sprites.png);
+ background-position: 10px 10px;
+ background-repeat: no-repeat;
+ .ie7-restore-right-whitespace();
- display: inline-block;
- width: 10px;
- height: 10px;
- vertical-align: middle;
- margin-right: 3px;
- background-image: url(../../images/arrow-sprites.png);
- background-position: 10px 10px;
- background-repeat: no-repeat;
- .ie7-restore-right-whitespace();
+ }
- }
+ &.up i { background-position: 0 -10px; }
+ &.back i { background-position: -10px -10px; }
+ &.expand i { background-position: -20px -10px; }
+
+ &.active.up i { background-position: 0 0; }
+ &.active.back i { background-position: -10px 0; }
+ &.active.expand i { background-position: -20px 0; }
- .arrow-down { background-position: 0 -10px; }
- .arrow-left { background-position: -10px -10px; }
- .arrow-right { background-position: -20px -10px; }
-
- li.active a {
-
- .arrow-down { background-position: 0 0; }
- .arrow-left { background-position: -10px 0; }
- .arrow-right { background-position: -20px 0; }
+ }
}
Modified: branches/2.0/plugins/qtDominionPlugin/css/less/main.css
==============================================================================
--- branches/2.0/plugins/qtDominionPlugin/css/less/main.css Thu Apr 5
18:51:10 2012 (r11404)
+++ branches/2.0/plugins/qtDominionPlugin/css/less/main.css Thu Apr 5
18:52:15 2012 (r11405)
@@ -902,7 +902,22 @@
#search-suggestions .group ul{padding-left:18px;}#search-suggestions .group ul
li{display:block;float:none;margin:0 0 0 0;padding:0;}#search-suggestions
.group ul li
a{text-transform:none;font-variant:normal;color:#0a3e94;padding:2px
0;font-size:14px;}#search-suggestions .group ul li a
span{font-family:Arial,Verdana,sans-serif;text-transform:uppercase;color:#6d6d6d;font-size:10px;padding:0
10px;}
#search-suggestions .group ul li.showall{font-style:oblique;}
#search-suggestions
div:last-child{border-bottom:none;text-transform:lowercase;font-variant:small-caps;margin:2px
0;font-size:15px;}#search-suggestions div:last-child a{padding-right:15px;}
-@media
(max-width:768px){#header{margin-left:-20px;margin-right:-20px;position:static;}#header
.container>.row:first-child{display:none;} #logo-and-name h1{margin:10px 0 0
0;text-align:center;} #header-search{margin:20px 10px 0 10px;}#header-search
input[name="query"]{border:2px solid #c2c2c2
!important;}}.popover{position:absolute;top:0;left:0;z-index:1010;display:none;padding:5px;}.popover.top{margin-top:-5px;}
+@media
(max-width:768px){#header{margin-left:-20px;margin-right:-20px;position:static;}#header
.container>.row:first-child{display:none;} #logo-and-name h1{margin:10px 0 0
0;text-align:center;} #header-search{margin:20px 10px 0 10px;}#header-search
input[name="query"]{border:2px solid #c2c2c2
!important;}}#treeview{white-space:nowrap;}#treeview ul li{padding:5px 0 5px
17px;background-color:rgba(0, 0, 0, 0.2);}#treeview ul li
a{color:#ffffff;font-family:Arial,Verdana,sans-serif;}
+#treeview ul li:hover{background-color:rgba(255, 255, 255,
0.2);text-decoration:none;}
+#treeview ul li .adminbuttons a:hover{color:#000000 !important;}
+#treeview ul li.expand{padding-left:2px !important;}
+#treeview ul li.up{border-bottom:1px solid #ffffff;padding-left:2px
!important;background:none;}
+#treeview ul li.back{border-bottom:1px solid #ffffff;padding-left:2px
!important;background:none;}
+#treeview ul li.active{background-color:#ffffff;}#treeview ul li.active
a{color:#f6ac00;}
+#treeview ul li.up i,#treeview ul li.back i,#treeview ul li.expand
i{display:inline-block;width:10px;height:10px;vertical-align:middle;margin-right:3px;background-image:url(../../images/arrow-sprites.png);background-position:10px
10px;background-repeat:no-repeat;*margin-right:.3em;}#treeview ul li.up
i:last-child,#treeview ul li.back i:last-child,#treeview ul li.expand
i:last-child{*margin-left:0;}
+#treeview ul li.up i:last-child,#treeview ul li.back i:last-child,#treeview ul
li.expand i:last-child{*margin-left:0;}
+#treeview ul li.up i{background-position:0 -10px;}
+#treeview ul li.back i{background-position:-10px -10px;}
+#treeview ul li.expand i{background-position:-20px -10px;}
+#treeview ul li.active.up i{background-position:0 0;}
+#treeview ul li.active.back i{background-position:-10px 0;}
+#treeview ul li.active.expand i{background-position:-20px 0;}
+.popover{position:absolute;top:0;left:0;z-index:1010;display:none;padding:5px;}.popover.top{margin-top:-5px;}
.popover.right{margin-left:5px;}
.popover.bottom{margin-top:5px;}
.popover.left{margin-left:-5px;}
@@ -975,22 +990,7 @@
.expandednav{overflow-y:auto !important;width:400px
!important;background-image:url(../../images/background.png);border-right:2px
solid white;-webkit-box-shadow:4px 4px 10px #6d6d6d;-moz-box-shadow:4px 4px
10px #6d6d6d;box-shadow:4px 4px 10px #6d6d6d;}
.btn:hover{color:#000000 !important;}.btn:hover
i{background-image:url(../../js/bootstrap/img/glyphicons-halflings.png);}
.tab-content h2{display:none;}
-#holdings{white-space:nowrap;}#holdings ul li{padding:5px 0 5px
17px;background-color:rgba(0, 0, 0, 0.2);}#holdings ul li
a{color:#ffffff;font-family:Arial,Verdana,sans-serif;}
-#holdings ul li:hover{background-color:rgba(255, 255, 255,
0.2);text-decoration:none;}
-#holdings ul li .adminbuttons a:hover{color:#000000 !important;}
-#holdings ul .expand{padding-left:2px !important;}
-#holdings ul .up{border-bottom:1px solid #ffffff;padding-left:2px
!important;background:none;}
-#holdings ul .back{border-bottom:1px solid #ffffff;padding-left:2px
!important;background:none;}
-#holdings ul .active{background-color:#ffffff;}#holdings ul .active
a{color:#f6ac00;}
#export{margin-left:10px;margin-top:20px;}
-[class^="arrow-"]{display:inline-block;width:10px;height:10px;vertical-align:middle;margin-right:3px;background-image:url(../../images/arrow-sprites.png);background-position:10px
10px;background-repeat:no-repeat;*margin-right:.3em;}[class^="arrow-"]:last-child{*margin-left:0;}
-[class^="arrow-"]:last-child{*margin-left:0;}
-.arrow-down{background-position:0 -10px;}
-.arrow-left{background-position:-10px -10px;}
-.arrow-right{background-position:-20px -10px;}
-#holdings .active a .arrow-down{background-position:0 0;}
-#holdings .active a .arrow-left{background-position:-10px 0;}
-#holdings .active a .arrow-right{background-position:-20px 0;}
#mediadisplay{background-color:#000000;padding:10px;color:#ffffff;margin-bottom:10px;}#mediadisplay
h2,#mediadisplay h2 a,#mediadisplay a,#mediadisplay p{color:#ffffff;}
#mediadisplay h2 a{font-size:18px;}
#mediadisplay #urlform,#mediadisplay
#uploadform{margin-bottom:20px;margin-top:20px;padding-bottom:20px;border-bottom:1px
solid #c2c2c2;}#mediadisplay #urlform input,#mediadisplay #uploadform
input,#mediadisplay #urlform a,#mediadisplay #uploadform a,#mediadisplay
#urlform button,#mediadisplay #uploadform button{vertical-align:middle;}
@@ -1025,7 +1025,7 @@
#right-column h3{color:#ffffff;margin-top:15px;font-style:oblique;}
#right-column p{color:#ffffff;font-size:smaller;}
#right-column div{margin-bottom:10px;}
-@media (max-width:768px){.nav-tabs,#left-column #facets,#left-column
.institution,.breadcrumb,.map,#searchfocus,#export,#mediaactions{display:none;}
.institutionX{width:100px;height:100px;}.institutionX
h2{font-size:14px;line-height:110%;}.institutionX h2
a{height:95px;width:95px;padding:3px;} .img h2:last-child a{height:90px;}
#wrapper,#left-column{margin-top:0 !important;} h1{font-size:20px
!important;line-height:110%;margin:auto 10px;}
#navigation{position:static;width:100% !important;} #right-column{margin:auto
10px !important;} #holdings{margin:auto 10px !important;white-space:normal;}
.indent{margin:auto 10px !important;} #arrow-right,#arrow-left{margin:5px
!important;} .tab-content h2,#headline2{display:block !important;}}@media
(min-width:768px) and (max-width:980px){#navigation{width:190px;} #mediadisplay
#image img{max-width:80%;}}@media
(min-width:1200px){#navigation{width:310px;}}#new-import,#past-imports,#import-progress{margin:20px;}
+@media (max-width:768px){.nav-tabs,#left-column #facets,#left-column
.institution,.breadcrumb,.map,#searchfocus,#export,#mediaactions{display:none;}
.institutionX{width:100px;height:100px;}.institutionX
h2{font-size:14px;line-height:110%;}.institutionX h2
a{height:95px;width:95px;padding:3px;} .img h2:last-child a{height:90px;}
#wrapper,#left-column{margin-top:0 !important;} h1{font-size:20px
!important;line-height:110%;margin:auto 10px;}
#navigation{position:static;width:100% !important;} #right-column{margin:auto
10px !important;} #treeview{margin:auto 10px !important;white-space:normal;}
.indent{margin:auto 10px !important;} #arrow-right,#arrow-left{margin:5px
!important;} .tab-content h2,#headline2{display:block !important;}}@media
(min-width:768px) and (max-width:980px){#navigation{width:190px;} #mediadisplay
#image img{max-width:80%;}}@media
(min-width:1200px){#navigation{width:310px;}}#new-import,#past-imports,#import-progress{margin:20px;}
#new-importx{padding:8px 35px 8px
14px;margin-bottom:18px;background-color:#grayLight;border:1px solid
#6d6d6d;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
#import-progress .row
.span4{width:200px;float:left;margin-left:20px;background-color:#3b3b3b;padding:10px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;text-shadow:none;}#import-progress
.row .span4 ul{margin-top:0 !important;}#import-progress .row .span4 ul
li{color:#ffffff;}
#import-progress .row .span7{width:350px;float:left;margin-left:20px;}
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
