Merge branch 'main' into dev

templates/components/context_menu.html

@@ -14,6 +14,9 @@
     <div class="context-menu-item" data-action="preview">
         <i class="fas fa-image"></i> Replace Preview
     </div>
+    <div class="context-menu-item" data-action="set-nsfw">
+        <i class="fas fa-exclamation-triangle"></i> Set Content Rating
+    </div>
     <div class="context-menu-separator"></div>
     <div class="context-menu-item" data-action="move">
         <i class="fas fa-folder-open"></i> Move to Folder
@@ -21,4 +24,21 @@
     <div class="context-menu-item delete-item" data-action="delete">
         <i class="fas fa-trash"></i> Delete Model
     </div>
+</div>
+
+<div id="nsfwLevelSelector" class="nsfw-level-selector">
+    <div class="nsfw-level-header">
+        <h3>Set Content Rating</h3>
+        <button class="close-nsfw-selector"><i class="fas fa-times"></i></button>
+    </div>
+    <div class="nsfw-level-content">
+        <div class="current-level">Current: <span id="currentNSFWLevel">Unknown</span></div>
+        <div class="nsfw-level-options">
+            <button class="nsfw-level-btn" data-level="1">PG</button>
+            <button class="nsfw-level-btn" data-level="2">PG13</button>
+            <button class="nsfw-level-btn" data-level="4">R</button>
+            <button class="nsfw-level-btn" data-level="8">X</button>
+            <button class="nsfw-level-btn" data-level="16">XXX</button>
+        </div>
+    </div>
 </div>

templates/components/controls.html

@@ -37,8 +37,8 @@
             <input type="text" id="searchInput" placeholder="Search models..." />
             <!-- 清空按钮将由JavaScript动态添加到这里 -->
             <i class="fas fa-search search-icon"></i>
-            <button class="search-mode-toggle" id="searchModeToggle" title="Toggle recursive search in folders">
-                <i class="fas fa-folder"></i>
+            <button class="search-options-toggle" id="searchOptionsToggle" title="Search Options">
+                <i class="fas fa-sliders-h"></i>
             </button>
              <button class="search-filter-toggle" id="filterButton" onclick="filterManager.toggleFilterPanel()" title="Filter models">
                 <i class="fas fa-filter"></i>
@@ -48,6 +48,33 @@
     </div>
 </div>
 
+<!-- Add search options panel -->
+<div id="searchOptionsPanel" class="search-options-panel hidden">
+    <div class="options-header">
+        <h3>Search Options</h3>
+        <button class="close-options-btn" id="closeSearchOptions">
+            <i class="fas fa-times"></i>
+        </button>
+    </div>
+    <div class="options-section">
+        <h4>Search In:</h4>
+        <div class="search-option-tags">
+            <div class="search-option-tag active" data-option="filename">Filename</div>
+            <div class="search-option-tag active" data-option="tags">Tags</div>
+            <div class="search-option-tag active" data-option="modelname">Model Name</div>
+        </div>
+    </div>
+    <div class="options-section">
+        <div class="search-option-switch">
+            <span>Include Subfolders</span>
+            <label class="switch">
+                <input type="checkbox" id="recursiveSearchToggle">
+                <span class="slider round"></span>
+            </label>
+        </div>
+    </div>
+</div>
+
 <!-- Add filter panel -->
 <div id="filterPanel" class="filter-panel hidden">
     <div class="filter-header">
@@ -62,6 +89,13 @@
             <!-- Tags will be dynamically inserted here -->
         </div>
     </div>
+    <div class="filter-section">
+        <h4>Tags (Top 20)</h4>
+        <div class="filter-tags" id="modelTagsFilter">
+            <!-- Top tags will be dynamically inserted here -->
+            <div class="tags-loading">Loading tags...</div>
+        </div>
+    </div>
     <div class="filter-actions">
         <button class="clear-filters-btn" onclick="filterManager.clearFilters()">
             Clear All Filters

templates/components/modals.html

@@ -147,6 +147,40 @@
                     Used for authentication when downloading models from Civitai
                 </div>
             </div>
+            
+            <div class="settings-section">
+                <h3>Content Filtering</h3>
+                
+                <div class="setting-item">
+                    <div class="setting-info">
+                        <label for="blurMatureContent">Blur NSFW Content</label>
+                        <div class="input-help">
+                            Blur mature (NSFW) content preview images
+                        </div>
+                    </div>
+                    <div class="setting-control">
+                        <label class="toggle-switch">
+                            <input type="checkbox" id="blurMatureContent" checked>
+                            <span class="toggle-slider"></span>
+                        </label>
+                    </div>
+                </div>
+                
+                <div class="setting-item">
+                    <div class="setting-info">
+                        <label for="showOnlySFW">Show Only SFW Results</label>
+                        <div class="input-help">
+                            Filter out all NSFW content when browsing and searching
+                        </div>
+                    </div>
+                    <div class="setting-control">
+                        <label class="toggle-switch">
+                            <input type="checkbox" id="showOnlySFW" value="{{ settings.get('show_only_sfw', False) }}" {% if settings.get('show_only_sfw', False) %}checked{% endif %}>
+                            <span class="toggle-slider"></span>
+                        </label>
+                    </div>
+                </div>
+            </div>
         </div>
         <div class="modal-actions">
             <button class="primary-btn" onclick="settingsManager.saveSettings()">Save</button>

templates/loras.html

@@ -86,7 +86,7 @@
         {% else %}
             {% include 'components/controls.html' %}
             <!-- Lora卡片容器 -->
-            <div class="card-grid" id="loraGrid" style="height: calc(100vh - [header-height]px); overflow-y: auto;">
+            <div class="card-grid" id="loraGrid">
                 <!-- Cards will be dynamically inserted here -->
             </div>
             <!-- Bulk operations panel will be inserted here by JavaScript -->