Selaa lähdekoodia

Started work on Debug Area for org
Disable tooltips on mobile
Added & replaces new group iamges

causefx 7 vuotta sitten
vanhempi
commit
55725d20d5

+ 57 - 0
index.php

@@ -118,6 +118,63 @@
         <div class="internal-listing p-0 hidden"></div>
         <div class="iFrame-listing p-0 hidden"></div>
     </div>
+    <!-- sample modal content -->
+    <div class="modal fade debugModal" tabindex="-1" role="dialog" aria-labelledby="debugModal"
+         aria-hidden="true" style="display: none;">
+        <div class="modal-dialog modal-lg">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                    <h4 class="modal-title" id="debugModal" lang="en">Organizr Debug Area</h4>
+                </div>
+                <div class="modal-body">
+                    <div class="white-box m-0">
+                        <div class="steamline">
+                            <div class="sl-item">
+                                <div class="sl-left bg-success"><i class="mdi mdi-code-tags"></i></div>
+                                <div class="sl-right">
+                                    <div class="form-group m-b-0">
+                                        <div id="" class="input-group">
+                                            <input id="debug-input" lang="en" placeholder="Input Command" type="text"
+                                                   class="form-control inline-focus">
+                                            <div class="input-group-btn">
+                                                <button type="button"
+                                                        class="btn waves-effect waves-light btn-info dropdown-toggle"
+                                                        data-toggle="dropdown" aria-expanded="false"><span lang="en">Suggestions</span>
+                                                    <span class="caret"></span></button>
+                                                <ul class="dropdown-menu dropdown-menu-right">
+                                                    <li><a onclick="orgDebugList('activeInfo.settings.sso.ombi');"
+                                                           href="javascript:void(0)"
+                                                           lang="en">Ombi SSO</a></li>
+                                                </ul>
+                                            </div>
+                                        </div>
+                                        <div class="clearfix"></div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div id="debugResultsBox" class="sl-item hidden">
+                                <div class="sl-left bg-info"><i class="mdi mdi-receipt"></i></div>
+                                <div class="sl-right">
+                                    <div><a href="#">Results</a></div>
+                                    <div id="debugResults" class="desc"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-danger waves-effect text-left" data-dismiss="modal">Close
+                    </button>
+                </div>
+            </div>
+            <!-- /.modal-content -->
+        </div>
+        <!-- /.modal-dialog -->
+    </div>
+    <!-- /.modal -->
     <!-- ============================================================== -->
     <!-- End Page Content -->
     <!-- ============================================================== -->

+ 9 - 1
js/custom.js

@@ -144,7 +144,9 @@ function pageLoad(){
     /* ===== Tooltip Initialization ===== */
 
     $(function () {
-        $('[data-toggle="tooltip"]').tooltip();
+        if(bowser.mobile !== true) {
+            $('[data-toggle="tooltip"]').tooltip();
+        }
         /*$('body').tooltip({
             selector: '[data-toggle="tooltip"]'
         });*/
@@ -1717,6 +1719,7 @@ Mousetrap.bind("c c", function() { closeCurrentTab() });
 Mousetrap.bind("s s", function() { openSettings() });
 Mousetrap.bind("h h", function() { openHomepage() });
 Mousetrap.bind("f f", function() { toggleFullScreen() });
+Mousetrap.bind("d d", function() { toggleDebug() });
 Mousetrap.bind("esc", function () {
     $('.splash-screen').removeClass('in').addClass('hidden')
 });
@@ -1753,3 +1756,8 @@ $(document).on('change', "#choose-calender-filter, #choose-calender-filter-statu
     $('#calendar').fullCalendar('rerenderEvents');
     new SimpleBar($('.fc-scroller')[0]);
 });
+$('#debug-input').keyup(function(e){
+    if(e.keyCode == 13) {
+        orgDebug();
+    }
+});

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
js/custom.min.js


+ 61 - 3
js/functions.js

@@ -18,6 +18,63 @@ $(document).ready(function () {
     launch();
 });
 /* NORMAL FUNCTIONS */
+function toggleDebug(){
+    $('.debugModal').modal('show')
+}
+function highlightObject(json) {
+    if (typeof json != 'string') {
+        json = JSON.stringify(json, undefined, 2);
+    }
+    json = json.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+    return json.replace(/("(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"(\s*:)?|\b(true|false|null)\b|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?)/g, function (match) {
+        var cls = 'number';
+        if (/^"/.test(match)) {
+            if (/:$/.test(match)) {
+                cls = 'key';
+            } else {
+                cls = 'string';
+            }
+        } else if (/true|false/.test(match)) {
+            cls = 'boolean';
+        } else if (/null/.test(match)) {
+            cls = 'null';
+        }
+        return '<span class="' + cls + '">' + match + '</span>';
+    });
+}
+function orgDebug(cmd) {
+    var cmd = $('#debug-input').val();
+    var result = '';
+    if (cmd !== '') {
+        result = eval(cmd);
+    }
+    if (result !== '') {
+        console.log(result);
+        console.log(typeof result);
+        $('#debugResultsBox').removeClass('hidden');
+        $('#debugResults').html(formatDebug(result));
+    } else {
+
+    }
+}
+function formatDebug(result){
+    var formatted = '';
+    switch (typeof result) {
+        case 'object':
+            formatted = highlightObject(result);
+            break;
+        default:
+            formatted = result;
+
+    }
+    return '<pre>' + formatted + '</pre>';
+}
+function orgDebugList(cmd){
+    if(cmd !== ''){
+        $('#debug-input').val(cmd);
+        orgDebug();
+    }
+}
 function getLangStrings(){
     console.log(JSON.stringify(window.langStrings))
 }
@@ -1908,6 +1965,7 @@ function userMenu(user){
 					<li class="append-menu"><a class="inline-popups" href="#account-area" data-effect="mfp-zoom-out"><i class="ti-settings fa-fw"></i> <span lang="en">Account Settings</span></a></li>
 					<li class="divider" role="separator"></li>
 					<li><a href="javascript:void(0)" onclick="lock();"><i class="ti-lock fa-fw"></i> <span lang="en">Lock Screen</span></a></li>
+					<li><a href="javascript:void(0)" onclick="toggleDebug();"><i class="mdi mdi-bug fa-fw"></i> <span lang="en">Debug Area</span></a></li>
 					<li><a href="javascript:void(0)" onclick="logout();"><i class="fa fa-sign-out fa-fw"></i> <span lang="en">Logout</span></a></li>
 				</ul><!-- /.dropdown-user -->
 			</li><!-- /.dropdown -->
@@ -3210,11 +3268,11 @@ function buildStreamItem(array,source){
 		switch (v.type) {
 			case 'music':
 				icon = 'icon-music-tone-alt';
-				width = 56;
-				bg = `
+				width = (v.nowPlayingImageURL !== 'plugins/images/cache/no-np.png') ? 56 : 100;
+				bg = (v.nowPlayingImageURL !== 'plugins/images/cache/no-np.png') ? `
 				<img class="imageSource imageSourceLeft" src="`+v.nowPlayingImageURL+`">
 				<img class="imageSource imageSourceRight" src="`+v.nowPlayingImageURL+`">
-				`;
+				` : '';
 				break;
 			case 'movie':
 				icon = 'icon-film';

BIN
plugins/images/groups/admin.png


BIN
plugins/images/groups/b1.png


BIN
plugins/images/groups/b2.png


BIN
plugins/images/groups/b3.png


BIN
plugins/images/groups/bl2.png


BIN
plugins/images/groups/bl3.png


BIN
plugins/images/groups/coadmin.png


BIN
plugins/images/groups/g3.png


BIN
plugins/images/groups/g4.png


BIN
plugins/images/groups/guest.png


BIN
plugins/images/groups/m1.png


BIN
plugins/images/groups/m2.png


BIN
plugins/images/groups/m3.png


BIN
plugins/images/groups/poweruser.png


BIN
plugins/images/groups/r1.png


BIN
plugins/images/groups/r2.png


BIN
plugins/images/groups/r3.png


BIN
plugins/images/groups/superuser.png


BIN
plugins/images/groups/user.png


BIN
plugins/images/groups/y1.png


BIN
plugins/images/groups/y2.png


BIN
plugins/images/groups/y3.png


Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä