Rename icon in sprite | wip #1719 @1.5

diff --git a/images/interface.svg b/images/interface.svg
index 5ab96c9afd43ccd64e37690d928956d29561c495..8539c7d84036845a8c5ba13ed71aaae60fd6e081 100644 (file)
--- a/images/interface.svg
+++ b/images/interface.svg
@@ -12,80 +12,4 @@
         <path d="m0 26l512 0 0 51-512 0z m0 204l512 0 0 52-512 0z m0 205l512 0 0 51-512 0z"/>
     </symbol>
 
-    <symbol id="interface-share" viewBox="0 0 512 512">
-        <path d="m143 440c-2 0-4 0-4 0-6-2-10-8-10-14l0-78-27 0c-30 0-55-24-55-55l0-164c0-31 25-55 55-55l308 0c30 0 55 24 55 55l0 164c0 31-25 55-55 55l-179 0-77 88c-2 2-7 4-11 4z m-41-338c-14 0-26 11-26 25l0 164c0 14 12 26 26 26l41 0c4 0 9 2 11 5 2 2 4 6 4 10l0 55 57-63c2-2 6-5 10-5l185 0c14 0 26-12 26-26l0-164c0-16-12-27-26-27z"/>
-    </symbol>
-
-    <symbol id="interface-bookmarks" viewBox="0 0 512 512">
-        <path d="m465 92l-51 0 0-16c0-8-6-15-15-15l-73 0c-9 0-15 7-15 15l0 16c-24 2-43 10-55 27-12-17-33-27-59-27l-150 0c-8 0-14 6-14 14l0 300c0 8 6 14 14 14l141 0c23 0 39 8 48 22 2 4 8 9 12 9 2 0 4 0 6-2 2 2 4 2 6 2 4 0 10-2 12-9 9-14 27-22 47-22l142 0c8 0 14-6 14-14l0-300c4-8-2-14-10-14z m-125-2l45 0 0 115-12-12c-2-3-6-5-11-5-4 0-8 2-10 5l-12 12z m-152 301l-127 0 0-270 136 0c28 0 45 16 45 45l0 240c-15-9-33-15-54-15z m263 0l-127 0c-21 0-39 6-54 17l0-242c0-29 15-43 41-45l0 119c0 6 4 10 8 12 7 2 13 0 17-4l26-27 27 27c2 2 6 4 10 4 2 0 4 0 7-2 6-2 8-8 8-12l0-117 37 0z"/>
-    </symbol>
-
-    <symbol id="interface-chapters" viewBox="0 0 512 512">
-        <path d="m184 154l267 0c11 0 20-10 20-21 0-11-9-20-20-20l-267 0c-11 0-20 9-20 20 0 11 9 21 20 21z m267 82l-267 0c-11 0-20 9-20 20 0 11 9 20 20 20l267 0c11 0 20-9 20-20 0-11-9-20-20-20z m0 122l-267 0c-11 0-20 10-20 21 0 11 9 20 20 20l267 0c11 0 20-9 20-20 0-11-9-21-20-21z m-369-204l20 0c12 0 21-10 21-21 0-11-9-20-21-20l-20 0c-11 0-21 9-21 20 0 11 10 21 21 21z m20 82l-20 0c-11 0-21 9-21 20 0 11 10 20 21 20l20 0c12 0 21-9 21-20 0-11-9-20-21-20z m0 122l-20 0c-11 0-21 10-21 21 0 11 10 20 21 20l20 0c12 0 21-9 21-20 0-11-9-21-21-21z"/>
-    </symbol>
-
-    <symbol id="interface-download" viewBox="0 0 512 512">
-        <path d="m434 344c-8 0-14 6-14 14l0 31c0 19-12 31-31 31l-264 0c-19 0-31-12-31-31l0-31c0-8-6-14-14-14-8 0-14 6-14 14l0 31c0 35 26 60 59 60l262 0c35 0 59-27 59-60l0-31c3-8-6-14-12-14z m-188 23c2 2 2 2 4 2 2 0 4 2 6 2 2 0 4 0 6-2 2 0 2-2 4-2l111-119c6-6 6-15 0-21-6-6-15-6-21 0l-86 92 0-245c0-8-6-15-14-15-8 0-14 7-14 15l0 245-86-92c-6-6-15-6-21 0-6 6-6 15 0 21z"/>
-    </symbol>
-
-    <symbol id="interface-email" viewBox="0 0 512 512">
-        <path d="m436 104l-360 0c-23 0-43 21-43 43l0 218c0 22 20 43 43 43l362 0c23 0 43-21 43-43l0-218c0-22-20-43-45-43z m15 261c0 6-9 14-15 14l-360 0c-8 0-15-8-15-14l0-218c0-8 9-14 15-14l362 0c8 0 15 8 15 14l0 218z m-52-187l-143 96-143-96c-7-4-17-2-21 4-4 6-2 17 4 21l152 100c2 2 6 2 8 2 2 0 6 0 8-2l152-100c6-4 8-13 4-21-4-6-12-8-21-4z m-237 94l-66 43c-6 4-8 13-4 21 2 4 8 6 12 6 2 0 7 0 9-2l65-43c6-4 8-12 4-21-6-6-14-8-20-4z m188 0c-6-4-16-2-20 4-4 7-2 17 4 21l65 43c2 2 7 2 9 2 4 0 8-2 12-6 4-6 2-17-4-21z"/>
-    </symbol>
-
-    <symbol id="interface-fullscreen" viewBox="0 0 512 512">
-        <path d="m446 74c-2-4-4-6-8-8-2 0-4-3-6-3l-141 0c-8 0-15 7-15 15 0 8 7 14 15 14l106 0-116 117c-7 6-7 14 0 20 2 2 6 4 10 4 4 0 8-2 10-4l117-116 0 106c0 8 6 14 14 14 8 0 14-6 14-14l0-141c3 0 0-2 0-4z m-215 207c-6-7-14-7-20 0l-117 116 0-106c0-8-6-15-14-15-8 0-14 7-14 15l0 141c0 2 0 4 2 6 2 4 4 6 8 8 2 0 4 3 6 3l141 0c8 0 15-7 15-15 0-8-7-14-15-14l-110 0 116-117c7-8 7-16 2-22z"/>
-    </symbol>
-
-    <symbol id="interface-fullscreen-exit" viewBox="0 0 512 512">
-        <path d="m223 281c-2 0-4-2-6-2l-141 0c-8 2-15 8-15 16 0 8 7 14 15 14l106 0-116 117c-7 6-7 14 0 20 4 3 6 5 10 5 4 0 8-2 10-5l117-116 0 106c0 8 6 15 14 15 8 0 14-7 14-15l0-141c0-2 0-4-2-6 0-4-2-6-6-8z m213-78l-106 0 116-117c7-6 7-14 0-20-6-7-14-7-20 0l-117 116 0-106c0-8-6-15-14-15-8 0-14 7-14 15l0 141c0 2 0 4 2 6 2 4 4 6 8 8 2 0 4 2 6 2l141 0c8 0 15-6 15-14 0-8-9-16-17-16z"/>
-    </symbol>
-
-    <symbol id="interface-help" viewBox="0 0 512 512">
-        <path d="m256 59c-109 0-197 88-197 197 0 109 88 197 197 197 109 0 197-88 197-197 0-109-88-197-197-197z m0 367c-94 0-170-76-170-170 0-94 76-170 170-170 94 0 170 76 170 170 0 94-76 170-170 170z m16-84c0 9-7 16-16 16-9 0-16-7-16-16 0-9 7-16 16-16 9 0 16 7 16 16z m-16-201c-33 0-61 27-61 62 0 8 6 12 12 12 6 0 12-6 12-12 0-19 17-35 35-35 18 0 35 16 35 35 0 18-17 35-35 35-8 0-12 6-12 12l0 41c0 8 6 12 12 12 6 0 12-6 12-12l0-29c27-6 47-31 47-59 4-35-24-62-57-62z"/>
-    </symbol>
-
-    <symbol id="interface-index" viewBox="0 0 512 512">
-        <path d="m315 66l-118 0c-9 0-15 6-15 14l0 147c0 9 6 15 15 15l118 0c9 0 15-6 15-15l0-147c0-8-6-14-15-14z m-14 147l-90 0 0-119 90 0z m14 57l-118 0c-9 0-15 6-15 15l0 147c0 8 6 14 15 14l118 0c9 0 15-6 15-14l0-147c0-9-6-15-15-15z m-14 148l-90 0 0-119 90 0z m195-352l-119 0c-8 0-15 6-15 14l0 147c0 9 7 15 15 15l119 0c8 0 14-6 14-15l0-147c0-8-6-14-14-14z m-15 147l-90 0 0-119 90 0z m-346-147l-119 0c-8 0-14 6-14 14l0 147c0 9 6 15 14 15l119 0c8 0 15-6 15-15l0-147c0-8-7-14-15-14z m-14 147l-90 0 0-119 90 0z m14 57l-119 0c-8 0-14 6-14 15l0 147c0 8 6 14 14 14l119 0c8 0 15-6 15-14l0-147c0-9-7-15-15-15z m-14 148l-90 0 0-119 90 0z"/>
-    </symbol>
-
-    <symbol id="interface-print" viewBox="0 0 512 512">
-        <path d="m424 186l-39 0 0-114c0-9-6-15-14-15l-230 0c-8 0-14 6-14 15l0 114-39 0c-22 0-41 19-41 41l0 121c0 23 19 41 41 41l39 0 0 49c0 8 6 15 14 15l230 0c8 0 14-7 14-15l0-49 39 0c22 0 41-18 41-41l0-121c0-22-19-41-41-41z m-268-100l200 0 0 100-200 0z m200 340l-200 0 0-88 200 0z m80-76c0 6-6 12-12 12l-39 0 0-38c0-9-6-15-14-15l-230 0c-8 0-14 6-14 15l0 38-39 0c-6 0-12-6-12-12l0-121c0-6 6-12 12-12l336 0c6 0 12 6 12 12z m-278-96l-33 0c-8 0-14 6-14 14 0 8 6 15 14 15l35 0c8 0 14-7 14-15 0-8-8-14-16-14z m32 139l132 0c8 0 14-6 14-14 0-8-6-14-14-14l-132 0c-8 0-14 6-14 14 0 8 6 14 14 14z"/>
-    </symbol>
-
-    <symbol id="interface-search" viewBox="0 0 512 512">
-        <path d="m451 430l-129-129c22-27 34-59 34-94 0-39-16-78-43-105-59-59-153-59-211 0-57 58-57 152 0 211 29 29 66 43 105 43 35 0 67-12 94-34l129 129c2 2 6 4 10 4 4 0 9-2 11-4 4-7 4-17 0-21z m-330-139c-47-47-47-123 0-170 22-23 53-35 84-35 31 0 61 12 84 35 22 22 35 53 35 84 0 33-13 61-35 84-23 22-53 35-84 35-31 2-60-11-84-33z"/>
-    </symbol>
-
-    <symbol id="interface-sound-off" viewBox="0 0 512 512">
-        <path d="m408 262l51-51c6-6 6-14 0-21-6-6-15-6-21 0l-49 52-51-52c-6-6-14-6-21 0-6 7-6 15 0 21l52 51-52 51c-6 6-6 15 0 21 2 2 7 4 11 4 4 0 8-2 10-4l51-51 51 51c2 2 6 4 11 4 4 0 8-2 10-4 6-6 6-15 0-21z m-162-184c-4-2-10-2-15 2l-102 82-68 0c-8 0-14 6-14 14l0 160c0 8 6 14 14 14l66 0 102 82c2 2 7 4 9 4 2 0 4 0 6-2 4-2 8-8 8-12l0-332c2-4-2-10-6-12z m-21 313l-82-67c-2-2-6-5-8-5l-57 0 0-129 57 0c4 0 6-2 8-4l82-67z"/>
-    </symbol>
-
-    <symbol id="interface-sound-on" viewBox="0 0 512 512">
-        <path d="m389 96c-6-4-14-4-20 2-4 6-4 15 2 21 41 35 69 88 69 137 0 49-26 102-69 137-6 4-6 15-2 21 2 4 6 6 10 6 4 0 6-2 8-4 49-39 80-103 80-160 0-57-31-119-78-160z m-51 62c-6-4-16-4-21 4-4 6-4 16 5 20 20 15 43 39 43 76 0 35-25 59-43 76-7 4-9 14-5 20 2 4 9 6 13 6 2 0 6 0 8-2 35-26 55-61 55-98 0-41-18-76-55-102z m-96-80c-4-2-11-2-15 2l-102 82-66 0c-8 0-14 6-14 14l0 160c0 8 6 14 14 14l66 0 102 82c2 2 6 4 9 4 2 0 4 0 6-2 4-2 8-8 8-12l0-332c0-4-4-10-8-12z m-21 313l-82-67c-2-2-6-5-8-5l-57 0 0-129 57 0c4 0 6-2 8-4l82-67z"/>
-    </symbol>
-
-    <symbol id="interface-facebook" viewBox="0 0 512 512">
-        <path d="m291 442l-78 0c-8 0-14-6-14-14l0-164-33 0c-8 0-14-6-14-14l0-62c0-8 6-14 14-14l33 0 0-12c0-19 8-47 24-64 15-16 37-24 64-26 20-2 55 0 57 0 8 0 14 6 14 14l0 57c0 9-6 15-14 15l-31 0c0 0-2 0-2 0 0 0-2 0-4 4-2 4-4 8-4 12l41 0c8 0 14 6 14 14l0 62c0 8-6 14-14 14l-41 0 0 164c2 6-4 14-12 14z m-64-28l49 0 0-164c0-8 7-14 15-14l41 0 0-33-41 0c-8 0-15-6-15-15l0-10c0-2 0-18 11-33 10-14 24-14 28-14l15 0 0-31c-13 0-29 0-41 0-21 0-35 6-45 17-11 10-19 33-19 45l0 26c0 9-6 15-14 15l-31 0 0 33 33 0c8 0 14 6 14 14z"/>
-    </symbol>
-
-    <symbol id="interface-linkedin" viewBox="0 0 512 512">
-        <path d="m166 221l-62 0c-14 0-26 12-26 27l0 160c0 14 12 26 26 26l62 0c14 0 27-12 27-26l0-160c0-15-13-27-27-27z m0 187l-62 0 0-160 62 0z m-31-330c-35 0-61 24-61 57 0 33 24 58 59 58 35 0 60-25 60-58 0-33-25-57-58-57z m-2 88c-20 0-33-14-33-31 0-16 13-31 33-31 21 0 33 13 33 31 2 17-12 31-33 31z m217 51c-12 0-24 2-35 6-4-2-8-4-12-4l-57 0c-8 0-15 2-19 8-4 6-8 13-8 21 0 10 0 100 0 160 0 6 2 14 8 18 4 4 13 8 19 8l61 0c8 0 17-4 21-10 4 6 12 10 20 10l62 0c14 0 26-12 26-26l0-93c2-59-33-98-86-98z m62 191l-62 0 0-86c0-23-2-37-20-37-15 0-15 10-19 18-2 4-2 8-2 12l0 91-61 0c0 0 0-146 0-160l55 0 0 22c6-10 21-26 47-26 35 0 62 22 62 71z"/>
-    </symbol>
-
-    <symbol id="interface-twitter" viewBox="0 0 512 512">
-        <path d="m188 420c-43 0-86-12-122-37-7-4-9-10-7-16 2-7 9-11 15-11 24 2 51 0 73-10-22-10-38-29-47-53-2-4 0-10 2-12-18-17-28-41-28-66 0-4 2-10 6-12 0 0 2 0 2-2-6-13-10-27-10-41 0-17 4-31 12-45 2-4 6-6 10-6 4 0 10 2 12 6 35 37 80 61 132 69 0 0 0 0 0-2 0-49 41-90 90-90 22 0 43 8 59 23 12-4 25-9 37-15 6-2 12-2 16 2 4 4 6 11 4 17-2 4-2 8-4 10 4 0 9 2 13 4 4 4 4 12 0 17-11 14-21 26-35 38 0 0 0 2 0 2-2 113-86 230-230 230z m-59-37c18 6 39 8 59 8 125 0 201-102 201-201 0-2 0-6 0-8 0-4 2-10 6-12 0 0 2 0 2-2-6 0-10-4-12-10-2-4 0-11 2-15 0 0 0 0-2 0-4 0-10 0-12-4-13-12-29-18-45-18-33 0-62 26-62 61 0 4 0 11 2 15 2 4 0 8-2 12-2 4-8 6-12 6-57-4-111-29-152-68 0 5 0 9 0 11 0 20 11 39 27 51 6 4 8 10 6 16-2 6-8 11-14 11-6 0-10 0-17-3 9 21 25 35 46 39 6 2 12 7 12 15 0 6-4 12-10 14-5 2-9 2-15 2 10 14 29 23 47 23 6 0 13 4 15 10 2 6 0 12-4 16-21 15-43 25-66 31z"/>
-    </symbol>
-
-    <symbol id="interface-googleplus" viewBox="0 0 512 512">
-        <path d="m305 211l-141 0c-8 0-14 6-14 14l0 60c0 8 6 14 14 14l55 0c-14 16-33 27-55 27-39 0-70-31-70-70 0-39 31-70 70-70 16 0 33 7 45 17 6 4 14 4 18 0l43-43c2-2 4-6 4-10 0-5-2-9-4-11-28-26-67-41-106-41-88 0-158 72-158 158 0 88 72 158 158 158 88 0 158-72 158-160l-3-31c-2-6-8-12-14-12z m-141 174c-72 0-129-57-129-129-2-72 57-129 129-129 26 0 53 8 74 25l-23 22c-14-10-33-16-51-16-53 0-98 45-98 98 0 53 45 98 98 98 41 0 78-26 92-65 2-4 0-10-2-13-2-4-6-6-12-6l-64 0 0-30 115 0 2 16c-2 72-59 129-131 129z m330-149l-54 0 0-62c0-8-6-14-14-14-8 0-16 6-16 14l0 59-60 0c-8 0-14 7-14 15 0 8 6 14 14 14l60 0 0 60c0 8 6 14 14 14 8 0 14-6 14-14l0-60 54 0c8 0 14-6 14-14 0-8-6-12-12-12z"/>
-    </symbol>
-
-    <symbol id="interface-viadeo" viewBox="0 0 512 512">
-        <path d="m160 428c-4 0-8-2-10-4-7-6-7-14 0-21 0 0 94-96 94-186 0-90-45-137-45-137-6-6-6-14 0-21 6-6 14-6 20 0 2 2 53 56 53 158 0 102-98 203-102 207-2 2-6 4-10 4z m49 29c-78 0-143-64-143-144 0-80 63-143 143-143 8 0 14 6 14 14 0 9-6 15-14 15-64 0-115 51-115 114 0 64 51 115 115 115 63 0 115-51 115-115 0-16-5-30-11-45-4-8 0-16 9-18 8-4 16 0 18 8 8 18 12 37 12 57 0 78-63 142-143 142z m158-207c0 0-2 0-2 0-19 0-33-10-43-25-15-22-13-39-7-51 11-22 39-37 62-39 31-4 41-22 41-22 4-7 10-9 16-9 6 2 10 9 10 15 0 8-4 78-28 106-10 17-31 25-49 25z m-23-41c6 8 12 12 21 12 10 0 22-4 28-14 8-10 15-33 19-53-9 4-21 8-33 10-17 0-33 10-39 20 0 4-4 11 4 25z"/>
-    </symbol>
-
-    <symbol id="interface-locales" viewBox="0 0 512 512">
-        <path d="m428 117l-174 0-4-29c-2-25-23-41-47-41l-119 0c-27 0-47 21-47 47l0 254c0 27 20 47 47 47l86 0 4 29c2 16 12 29 27 37 8 4 14 6 20 6l209 0c27 0 47-21 47-47l0-256c0-27-22-47-49-47z m-344 252c-12 0-21-11-21-21l0-254c0-12 11-20 21-20l119 0c10 0 20 8 20 18l35 277z m152 26c-15 17-21 23-25 27-2 2-4 4-6 8-2-4-4-6-4-10l-2-25z m215 23c0 12-11 20-21 20l-197 0c7-6 15-14 41-45l5-4c4-4 10-10 8-22l-31-224 172 0c12 0 21 11 21 21l0 254z m-310-268l-55 147 25 0 14-41 55 0 15 41 24 0-51-147z m-8 86l12-39c5-11 7-19 9-27 0 2 2 6 4 12 2 6 4 11 4 13l14 38-43 0z m281-9l-37 0 0-41-27 0 0 41-47 0 0 21 98 0c-2 16-8 49-26 69-29 33-64 41-64 41l6 27c2 0 43-10 78-49 35-39 35-96 35-98l-12 0 0-11z"/>
-    </symbol>
-
 </svg>

diff --git a/js/libs/fluidbook/fluidbook.help.js b/js/libs/fluidbook/fluidbook.help.js
index c5812f8254bed7c46180724067e45317f5afb6fd..13e2e4d00dd3d6836bd05bb63f61411fd7e297d4 100644 (file)
--- a/js/libs/fluidbook/fluidbook.help.js
+++ b/js/libs/fluidbook/fluidbook.help.js
@@ -65,21 +65,24 @@ FluidbookHelp.prototype = {
                        }\r
 \r
                        var icon = $(this).find('.nav-icon:visible:first'); // Must get first visible icon so "toggle" icons work\r
-                       var offset = icon.offset();\r
-                       var left;\r
-\r
-                       if ($this.fluidbook.l10n.dir == 'ltr') {\r
-                               left = offset.left + (icon.outerWidth() / 2);\r
-                       } else {\r
-                               left = (ww - offset.left - (icon.outerWidth() / 2)) * -1;\r
-                       }\r
-\r
-                       var c = 'nav';\r
-                       if ($(this).parents("#afterSearch").length > 0) {\r
-                               c = 'afterSearch';\r
-                       }\r
-                       help += '<div class="icon ' + c + '" style="padding-top:' + h + 'px;left:' + left + 'px;"><span>' + text + '</span></div>';\r
-                       h -= 25;\r
+                       if(icon.length>0) {\r
+                var offset = icon.offset();\r
+\r
+                var left;\r
+\r
+                if ($this.fluidbook.l10n.dir == 'ltr') {\r
+                    left = offset.left + (icon.outerWidth() / 2);\r
+                } else {\r
+                    left = (ww - offset.left - (icon.outerWidth() / 2)) * -1;\r
+                }\r
+\r
+                var c = 'nav';\r
+                if ($(this).parents("#afterSearch").length > 0) {\r
+                    c = 'afterSearch';\r
+                }\r
+                help += '<div class="icon ' + c + '" style="padding-top:' + h + 'px;left:' + left + 'px;"><span>' + text + '</span></div>';\r
+                h -= 25;\r
+            }\r
                });\r
                // $("#horizontalNav").transform({\r
                //      scale: [scale, scale]\r

diff --git a/js/libs/fluidbook/fluidbook.nav.js b/js/libs/fluidbook/fluidbook.nav.js
index 28f3d406b004a99fba895618eedbef81c51526f0..e6591d9d2fa15519691e39b3f6d75d77cbdc4a1f 100644 (file)
--- a/js/libs/fluidbook/fluidbook.nav.js
+++ b/js/libs/fluidbook/fluidbook.nav.js
@@ -169,8 +169,8 @@ FluidbookNav.prototype = {
             res += getSpriteIcon(name);
 
             // Special case for icons that have an additional state
-            if (name == 'interface-fullscreen') {
-                res += getSpriteIcon('interface-fullscreen-exit');
+            if (name == 'nav-fullscreen') {
+                res += getSpriteIcon('nav-fullscreen-exit');
             }
         }
 
@@ -353,23 +353,23 @@ FluidbookNav.prototype = {
                     return false;
                 })
             } else if (icon == 'index') {
-                link = this.addLink(navType, 'interface-index', '#/index', 'index', 'overview', 'overview');
+                link = this.addLink(navType, 'nav-index', '#/index', 'index', 'overview', 'overview');
             } else if (icon == 'chapters') {
                 if (this.fluidbook.datas.displayChaptersIcon) {
                     if (this.fluidbook.datas.chaptersPage != '') {
-                        link = this.addLink(navType, 'interface-chapters', '#/page/' + this.fluidbook.datas.chaptersPage, 'chapters', 'chapters', 'chapters');
+                        link = this.addLink(navType, 'nav-chapters', '#/page/' + this.fluidbook.datas.chaptersPage, 'chapters', 'chapters', 'chapters');
                     } else if (this.fluidbook.datas.chapters.length > 0) {
 
                         // NOTE: Currently the MMenu breaks when the non-cascading chapter UL HTML is inserted so it will
                         // be opened in a popup for now. Todo: fix this so it works as a sub panel of it's own
                         if (navType == 'menu' && this.fluidbook.datas.chaptersCascade) {
-                            link = this.addLink(navType, 'interface-chapters', '', 'chapters', 'chapters', 'chapters');
+                            link = this.addLink(navType, 'nav-chapters', '', 'chapters', 'chapters', 'chapters');
 
                             // Get HTML for submenus (appended later)
                             this.chaptersMenuHTML = this.makeChapterLists(this.fluidbook.datas.chapters);
 
                         } else {
-                            link = this.addLink(navType, 'interface-chapters', '#/chapters', 'chapters', 'chapters', 'chapters');
+                            link = this.addLink(navType, 'nav-chapters', '#/chapters', 'chapters', 'chapters', 'chapters');
                         }
                     }
                 }
@@ -381,7 +381,7 @@ FluidbookNav.prototype = {
                     if (navType == 'horizontalNav') {
 
                         if (this.fluidbook.datas.share) {
-                            link = this.addLink(navType, 'interface-share', '#/share', 'share', 'share', 'share');
+                            link = this.addLink(navType, 'nav-share', '#/share', 'share', 'share', 'share');
                         }
 
                     } else if (navType == 'menu') {
@@ -393,17 +393,17 @@ FluidbookNav.prototype = {
                 }
 
             } else if (icon == 'bookmark' && this.fluidbook.datas.bookmark) {
-                link = this.addLink(navType, 'interface-bookmarks', '#/bookmark', 'bookmarks', 'bookmarks', 'bookmarks');
+                link = this.addLink(navType, 'nav-bookmarks', '#/bookmark', 'bookmarks', 'bookmarks', 'bookmarks');
 
             } else if (icon == 'pdf' && this.fluidbook.datas.pdf) {
-                link = this.addLink(navType, 'interface-download', '#', 'download', 'download', 'download');
+                link = this.addLink(navType, 'nav-download', '#', 'download', 'download', 'download');
 
             } else if (icon == 'print' && this.fluidbook.datas.print) {
-                link = this.addLink(navType, 'interface-print', '#', 'print', 'print', 'print');
+                link = this.addLink(navType, 'nav-print', '#', 'print', 'print', 'print');
 
             } else if (icon == 'lang' && this.fluidbook.l10n.multilangEnabled) {
                 // Note: the "!" at the beginning of the title/help parameters means that we don't want these strings translated
-                link = this.addLink(navType, 'interface-locales', '#/locales', 'locales', '!' + this.fluidbook.l10n.getCurrentLanguageName(), '!Select Language');
+                link = this.addLink(navType, 'nav-locales', '#/locales', 'locales', '!' + this.fluidbook.l10n.getCurrentLanguageName(), '!Select Language');
 
             } else if (icon == 'archives') {
                 if (this.fluidbook.datas.archivesLink != '') {
@@ -413,20 +413,20 @@ FluidbookNav.prototype = {
                 }
 
             } else if (icon == 'help') {
-                link = this.addLink(navType, 'interface-help', '#', 'help', 'help', 'help');
+                link = this.addLink(navType, 'nav-help', '#', 'help', 'help', 'help');
 
             } else if (icon == 'zoom' && !this.fluidbook.support.isMobile) {
                 link = this.addLink(navType, 'nav-zoomin', '#', 'zoomin', 'zoom in', 'zoom in');
                 link = this.addLink(navType, 'nav-zoomout', '#', 'zoomout', 'zoom out', 'zoom out');
 
             } else if (icon == 'fullscreen' && Modernizr.fullscreen && !DATAS.phonegap) {
-                link = this.addLink(navType, 'interface-' + icon, '#', icon, 'full screen', 'switch between fullscreen and normal');
+                link = this.addLink(navType, 'nav-' + icon, '#', icon, 'full screen', 'switch between fullscreen and normal');
 
             } else if (icon == 'search') {
 
                 // Only the horizontal icon menu has the search icon, which opens the main menu
                 if (this.fluidbook.datas.search && navType == 'horizontalNav') {
-                    link = this.addLink(navType, 'interface-search', '#', 'searchIcon', 'search', 'search');
+                    link = this.addLink(navType, 'nav-search', '#', 'searchIcon', 'search', 'search');
                 }
 
             } else if (icon == 'extra') {
@@ -641,7 +641,7 @@ FluidbookNav.prototype = {
         var $this = this;
         var res = '<form action="#" id="searchForm" method="post">';
         res += '<input type="text" id="q" name="q" type="search" value="" placeholder="' + this.fluidbook.l10n.__('search') + '" autocorrect="off" autocomplete="off" autocapitalize="off" />';
-        res += this.getLink('interface-search', '#', 'submitSearch');
+        res += this.getLink('nav-search', '#', 'submitSearch');
         res += '</form>';
         res += '<div id="menuSearchHints" class="mm-nopanel"></div>';
         res += '<div id="menuSearchResults" class="mm-nopanel"></div>';

diff --git a/js/libs/fluidbook/fluidbook.share.js b/js/libs/fluidbook/fluidbook.share.js
index 73c1f3caa365be0e140cabd7a47047f584e142fd..2d9352c5438c1e068b7f68dd173ad4c679501805 100644 (file)
--- a/js/libs/fluidbook/fluidbook.share.js
+++ b/js/libs/fluidbook/fluidbook.share.js
@@ -59,7 +59,7 @@ FluidbookShare.prototype = {
         for (var shareType in shareLinks) {
             if (shareLinks.hasOwnProperty(shareType)) { // Ensure we don't get inherited properties
                 shareHTML += '<li data-level="0"><a href="#" data-service="' + shareType + '" class="share level0">';
-                shareHTML += getSpriteIcon('interface-' + shareType);
+                shareHTML += getSpriteIcon('share-' + shareType);
                 if (!hideLabels) {
                     shareHTML += ' ' + shareLinks[shareType];
                 }
@@ -78,7 +78,7 @@ FluidbookShare.prototype = {
         view = '<div class="caption">' + this.fluidbook.menu.closeButton() + '<h2>' + this.fluidbook.l10n.__('share') + '</h2></div>';
         view += '<div class="content">';
         view += this.getShareLinks();
-        view += '</div>';
+        view += '</div>';;
 
         $("#view").append('<div class="mview" data-menu="share">' + view + '</div>');
         if (callback != undefined) {